修改登录UI

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

@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Gbound;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.NewSssku;
 import com.xingdata.zzdpos.model.Pager;
-import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.model.Trule;
 import com.xingdata.zzdpos.model.Ubound;
 import com.xingdata.zzdpos.model.UsskuParam;
@@ -256,9 +255,11 @@ public final class ApiFactory {
          * @param pageSize
          * @return
          */
-        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(String orderStatus,int pageNulmber, int
+        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList
+        (String orderStatus, int pageNulmber, int
                 pageSize, long startDate, long endDate) {
-            return Api.getInstance().service.getSaleOrder(orderStatus,pageNulmber, pageSize, startDate,
+            return Api.getInstance().service.getSaleOrder(orderStatus, pageNulmber, pageSize,
+                    startDate,
                     endDate).onErrorReturn(new
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
@@ -456,7 +457,8 @@ public final class ApiFactory {
 
     public static class TRULE {
         public static Observable<Pager<Trule>> truleQuery() {
-            return Api.getInstance().service.truleQuery().onErrorReturn(new
+            return Api.getInstance().service.truleQuery(System.currentTimeMillis() + "")
+                    .onErrorReturn(new
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
@@ -713,8 +715,9 @@ public final class ApiFactory {
          * @return
          */
         public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber,
-                                                                                 int
-                pageSize, long startDate, long endDate) {
+                                                                                 int pageSize,
+                                                                                 long startDate,
+                                                                                 long endDate) {
             return Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate,
                     endDate).onErrorReturn(new
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
@@ -738,7 +741,7 @@ public final class ApiFactory {
 
     public static class Sta {
         /**
-        /**
+         * /**
          * 查询统计详情
          */
         public static Observable<com.xingdata.zzdpos.model.Sta> querySta() {
@@ -985,7 +988,7 @@ public final class ApiFactory {
 
 
         public static Observable<Pager<com.xingdata.zzdpos.model.Level>> getVipLevelList(int pageNumber, int pageSize) {
-            return Api.getInstance().service.getVipLevelList(pageNumber,pageSize)
+            return Api.getInstance().service.getVipLevelList(pageNumber, pageSize)
                     .onErrorReturn(new ErrorFilter<>())
                     .map(new ResultFilter<>())
                     .subscribeOn(Schedulers.io())

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

@@ -136,8 +136,13 @@ interface ApiService {
                                                                    ("wd") String wd);
 
     @POST(C.URL.ORDER.getSaleOrder)
-    Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("orderStatus") String orderStatus,@Query("pageNumber") int pageNum, @Query
-            ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
+    Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("orderStatus") String
+                                                                   orderStatus, @Query
+                                                                   ("pageNumber") int pageNum,
+                                                           @Query
+                                                                   ("pageSize") int pageSize,
+                                                           @Query("startDate") long startDate,
+                                                           @Query("endDate") long
                                                                    endDate);
 
     @POST(C.URL.ORDER.getOrderDetail)
@@ -267,7 +272,7 @@ interface ApiService {
 
 
     @POST(C.URL.TRULE.truleQuery)
-    Observable<HttpMessage<Pager<Trule>>> truleQuery();
+    Observable<HttpMessage<Pager<Trule>>> truleQuery(@Query("startDate") String data);
 
     @POST(C.URL.TRULE.truleDetail)
     Observable<HttpMessage<String>> truleDetail(@Query("id") String id);
@@ -344,7 +349,8 @@ interface ApiService {
     Observable<HttpMessage<Level>> updateVipLevel(@Body Level l);
 
     @POST(C.URL.LEVEL.queryAll)
-    Observable<HttpMessage<Pager<Level>>> getVipLevelList(@Query("pageNumber") int pageNumber, @Query ("pageSize") int pageSize);
+    Observable<HttpMessage<Pager<Level>>> getVipLevelList(@Query("pageNumber") int pageNumber,
+                                                          @Query("pageSize") int pageSize);
 
     @POST(C.URL.MSCARD.update)
     Observable<HttpMessage<Mscard>> updateMscard(@Body Mscard m);
@@ -374,8 +380,8 @@ interface ApiService {
 
     @POST(C.URL.VIP.query)
     Observable<HttpMessage<Pager<Vip>>> getVipList(@Query("vipLevel") String keycode,
-                                       @Query("pageNumber") int pageNumber,
-                                       @Query("pageSize") int pageSize);
+                                                   @Query("pageNumber") int pageNumber,
+                                                   @Query("pageSize") int pageSize);
 
 
 }

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -135,6 +135,9 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         if (getBaseActivity() != null && getBaseActivity().mDialogs != null) {
             getBaseActivity().mDialogs.remove(this);
         }
+        if (null != mDisp && (!mDisp.isDisposed())) {
+            mDisp.dispose();
+        }
 
     }
 
@@ -203,6 +206,10 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
 
     public void dismiss() {
         if (isShowing) {
+            if (null != mDisp && (!mDisp.isDisposed())) {
+                mDisp.dispose();
+            }
+
             super.dismiss();
         }
     }

app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java

@@ -10,10 +10,8 @@ import com.xingdata.zzdpos.base.BaseDialog;
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.databinding.DialogLoadingBinding;
 
-import io.reactivex.disposables.Disposable;
-
 public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> {
-    Disposable disp;
+    //    Disposable disp;
     boolean isClose = true;
 
     @Override
@@ -39,8 +37,7 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
     }
 
     public void show(BaseActivity activity, boolean isClose) {
-        this.isClose = isClose;
-        show(activity);
+        super.show(activity);
     }
 
     @Override
@@ -51,9 +48,9 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
-        if (null != disp && (!disp.isDisposed())) {
-            disp.dispose();
-        }
+//        if (null != disp && (!disp.isDisposed())) {
+//            disp.dispose();
+//        }
 
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/BindingCounterFragment.java

 package com.xingdata.zzdpos.ui.login.fragment;
 
+import android.graphics.Color;
 import android.view.View;
-import android.widget.AdapterView;
 
+import com.bigkoo.pickerview.OptionsPickerView;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -11,6 +12,7 @@ import com.xingdata.zzdpos.databinding.FragmentBindingCounterBinding;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
+import com.xingdata.zzdpos.ui.login.fragment.bean.Cashers;
 import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
 import com.xingdata.zzdpos.util.OnClickListener;
 
@@ -30,7 +32,7 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
     long CounterId = -1;
     //-1没有选择，0新增，1绑定现有款台
     int isNewCounterCount = -1;
-    List<String> dataset;
+    List<Cashers> dataset;
 
     @Override
     public int getLayoutId() {
@@ -49,26 +51,16 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
         if (LoginPresenter.userStoreInfo.getMerchant() != null) {
             mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName
                     ());
+            mViewBinding.tvInStorename.setText(mShops.getPickerViewText());
+            mViewBinding.tvStoreAddress.setText(mShops.getCityProvName()+"/"+mShops.getCityName()+"/"+mShops.getCityCountyName()+"/"+mShops.getCityAddress());
         }
         dataset = new ArrayList<>();
         for (int i = 0; i < mShops.getCashers().size(); i++) {
-            dataset.add(mShops.getCashers().get(i).getCasherNo() + "款台");
+            dataset.add(mShops.getCashers().get(i));
         }
         if (dataset.size() > 0) {
-            CounterId = mShops.getCashers().get(0).getCasherId();
-            mViewBinding.counterSpinner.attachDataSource(dataset);
-            mViewBinding.counterSpinner.setOnItemSelectedListener(new AdapterView
-                    .OnItemSelectedListener() {
-
-                @Override
-                public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                    CounterId = mShops.getCashers().get(i).getCasherId();
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> adapterView) {
-                }
-            });
+            CounterId = dataset.get(0).getCasherId();
+            mViewBinding.tvSelectCounter.setText(dataset.get(0).getCasherNo() + "号款台");
         }
         mViewBinding.setOnClickListener(view -> {
             switch (view.getId()) {
@@ -106,6 +98,14 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
 
                 }
                 break;
+                case R.id.tv_select_counter: {
+                    if (dataset.size() > 0) {
+                        ShowPickerViewStoreAddress();
+                    } else {
+                        ToastUtils.showLong("当前门店没有款台请新建款台");
+                    }
+                }
+                break;
                 default: {
 
                 }
@@ -114,6 +114,29 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
         });
     }
 
+    /**
+     * 弹出款台选择器
+     */
+    private void ShowPickerViewStoreAddress() {// 弹出选择器
+
+        OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
+                OptionsPickerView.OnOptionsSelectListener() {
+                    @Override
+                    public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                        String tx = dataset.get(options1).getPickerViewText();
+                        mViewBinding.tvSelectCounter.setText(tx + "号款台");
+                        CounterId = dataset.get(options1).getCasherNo();
+                    }
+                }).setTitleText("款台选择")
+                .setDividerColor(Color.BLACK)
+                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setContentTextSize(20)
+                .build();
+
+        pvOptions.setPicker(dataset);
+        pvOptions.show();
+    }
+
     /**
      * 设置新增款台或者绑定款台的ui信息
      */

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/ChoiceStoreFragment.java

 package com.xingdata.zzdpos.ui.login.fragment;
 
+import android.graphics.Color;
 import android.view.View;
-import android.widget.AdapterView;
 
+import com.bigkoo.pickerview.OptionsPickerView;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -26,6 +27,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
     private Shops shops;
     private Boolean lock = false;
     private LoadingDialog mLoadingDialog = new LoadingDialog();
+    List<Shops> list = new ArrayList<>();
 
     @Override
     public int getLayoutId() {
@@ -34,7 +36,7 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
 
     @Override
     public void initView() {
-        mViewBinding.icTitle.tvTitle.setText("绑定款台");
+        mViewBinding.icTitle.tvTitle.setText("选择门店");
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -54,6 +56,15 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
                     }
 
 //                    mPresenter.getUserStoreInfo("");
+                }
+                break;
+                case R.id.tv_select_store: {
+                    if (list.size() > 0) {
+                        ShowPickerViewStoreAddress();
+                    } else {
+                        ToastUtils.showLong("当前没有门店数据，请选择新建门店");
+                    }
+
                 }
                 break;
                 case R.id.ll_new_store: {
@@ -74,29 +85,36 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
         lock = true;
         if (LoginPresenter.userStoreInfo.getShops().size() > 0) {
             shops = LoginPresenter.userStoreInfo.getShops().get(0);
+            mViewBinding.tvSelectStore.setText(shops.getPickerViewText());
         }
 
         mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName());
-        List<String> dataset = new ArrayList<>();
         for (int i = 0; i < LoginPresenter.userStoreInfo.getShops().size(); i++) {
-            dataset.add(LoginPresenter.userStoreInfo.getShops().get(i).getShopName());
+            list.add(LoginPresenter.userStoreInfo.getShops().get(i));
         }
-        if (dataset.size() > 0) {
-
-            mViewBinding.storeSpinner.attachDataSource(dataset);
-            mViewBinding.storeSpinner.setOnItemSelectedListener(new AdapterView
-                    .OnItemSelectedListener() {
-
-                @Override
-                public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                    shops = LoginPresenter.userStoreInfo.getShops().get(i);
-                }
+    }
 
-                @Override
-                public void onNothingSelected(AdapterView<?> adapterView) {
-                }
-            });
-        }
+    /**
+     * 弹出门店择器
+     */
+    private void ShowPickerViewStoreAddress() {// 弹出选择器
+
+        OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
+                OptionsPickerView.OnOptionsSelectListener() {
+                    @Override
+                    public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                        String tx = list.get(options1).getPickerViewText();
+                        mViewBinding.tvSelectStore.setText(tx);
+                        shops = list.get(options1);
+                    }
+                }).setTitleText("门店选择")
+                .setDividerColor(Color.BLACK)
+                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setContentTextSize(20)
+                .build();
+
+        pvOptions.setPicker(list);
+        pvOptions.show();
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/bean/Cashers.java

 package com.xingdata.zzdpos.ui.login.fragment.bean;
 
+import com.bigkoo.pickerview.model.IPickerViewData;
+
 /**
  * Created by Administrator on 2017/11/6.
  */
 
-public class Cashers {
+public class Cashers implements IPickerViewData {
     private long id;
     private long opMapId;
     private long channelMapId;
@@ -95,4 +97,9 @@ public class Cashers {
     public void setCasherNum(long casherNum) {
         this.casherNum = casherNum;
     }
+
+    @Override
+    public String getPickerViewText() {
+        return this.casherNo + "";
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/bean/Shops.java

 package com.xingdata.zzdpos.ui.login.fragment.bean;
 
+import com.bigkoo.pickerview.model.IPickerViewData;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Created by Administrator on 2017/11/3.
  */
-public class Shops {
+public class Shops implements IPickerViewData {
 
     private long shopMapId;
     private long shopIfId;
@@ -261,4 +263,8 @@ public class Shops {
         return createTime;
     }
 
+    @Override
+    public String getPickerViewText() {
+        return this.shopName;
+    }
 }

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

@@ -41,7 +41,8 @@
 
                     <TextView
                         style="@style/textView_title"
-                        android:text="@string/binding_counter_tv_nickname"/>
+                        android:text="@string/binding_counter_tv_nickname"
+                        android:textSize="@dimen/et_textsize"/>
 
                     <TextView
                         android:id="@+id/tv_nickname"
@@ -51,7 +52,7 @@
                         android:gravity="center|left"
                         android:text="北京浙星信息技术有限公司"
                         android:textColor="@color/black_baozheng"
-                        android:textSize="@dimen/et_textsize"
+                        android:textSize="@dimen/text_three_title"
                         android:textStyle="bold"/>
                 </LinearLayout>
 
@@ -64,7 +65,8 @@
 
                     <TextView
                         style="@style/textView_title"
-                        android:text="@string/binding_counter_tv_in_store"/>
+                        android:text="@string/binding_counter_tv_in_store"
+                        android:textSize="@dimen/et_textsize"/>
 
                     <TextView
                         android:id="@+id/tv_in_storename"
@@ -74,7 +76,7 @@
                         android:gravity="center|left"
                         android:text="丰台万达店"
                         android:textColor="@color/black_baozheng"
-                        android:textSize="@dimen/et_textsize"
+                        android:textSize="@dimen/text_three_title"
                         android:textStyle="bold"/>
                 </LinearLayout>
 
@@ -87,17 +89,18 @@
 
                     <TextView
                         style="@style/textView_title"
-                        android:text="@string/binding_counter_tv_store_address"/>
+                        android:text="@string/binding_counter_tv_store_address"
+                        android:textSize="@dimen/et_textsize"/>
 
                     <TextView
-                        android:id="@+id/tv_storetype"
+                        android:id="@+id/tv_store_address"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/counter_input_height"
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:gravity="center_vertical"
                         android:text="北京市丰台区万达广场一区"
                         android:textColor="@color/black_baozheng"
-                        android:textSize="@dimen/et_textsize"
+                        android:textSize="@dimen/text_three_title"
                         android:textStyle="bold"/>
                 </LinearLayout>
 
@@ -118,7 +121,8 @@
                         <TextView
                             style="@style/textView_title"
                             android:layout_marginLeft="0dp"
-                            android:text="@string/binding_counter_tv_binding_counter"/>
+                            android:text="@string/binding_counter_tv_binding_counter"
+                            android:textSize="@dimen/et_textsize"/>
 
 
                         <LinearLayout
@@ -153,14 +157,20 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/all_margin_left">
 
-                        <org.angmarch.views.NiceSpinner
-                            android:id="@+id/counter_spinner"
+
+                        <TextView
+                            android:id="@+id/tv_select_counter"
+                            style="@style/editText_new"
                             android:layout_width="@dimen/et_width"
-                            android:layout_height="@dimen/counter_input_height"
-                            android:background="@drawable/transparent_border"
-                            android:gravity="center_vertical"
-                            android:text=""
-                            android:textSize="@dimen/et_textsize"/>
+                            android:layout_marginLeft="0dp"
+                            android:layout_marginTop="@dimen/all_padding"
+                            android:drawablePadding="@dimen/all_padding"
+                            android:drawableRight="@mipmap/createstore_drop_down"
+                            android:ems="10"
+                            android:hint="选择款台"
+                            android:maxLength="11"
+                            android:onClick="@{onClickListener}"
+                            android:textSize="@dimen/text_three_title"/>
                     </LinearLayout>
 
 

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

@@ -104,15 +104,19 @@
                         android:layout_marginLeft="@dimen/all_margin_left"
                         android:layout_marginTop="@dimen/all_padding">
 
-                        <org.angmarch.views.NiceSpinner
-                            android:id="@+id/store_spinner"
-                            android:layout_width="@dimen/nicespinner_width"
-                            android:layout_height="@dimen/counter_input_height"
-                            android:background="@drawable/blue_border"
-                            android:gravity="center_vertical"
-                            android:paddingLeft="@dimen/et_padding"
-                            android:text="123"
-                            android:textSize="@dimen/et_textsize"/>
+                        <TextView
+                            android:id="@+id/tv_select_store"
+                            style="@style/editText_new"
+                            android:layout_width="@dimen/et_width"
+                            android:layout_marginLeft="0dp"
+                            android:layout_marginTop="@dimen/all_padding"
+                            android:drawablePadding="@dimen/all_padding"
+                            android:drawableRight="@mipmap/createstore_drop_down"
+                            android:ems="10"
+                            android:hint="请选择门店"
+                            android:maxLength="11"
+                            android:onClick="@{onClickListener}"/>
+
                     </LinearLayout>
 
 

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

@@ -52,7 +52,7 @@
                     android:maxLength="11"
                     android:padding="@dimen/et_padding"
                     android:singleLine="true"
-                    android:textColor="@color/white"
+                    android:textColor="@color/black_baozheng"
                     android:textColorHint="@color/hint"
                     android:textSize="@dimen/et_textsize"
                     android:visibility="gone"/>

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

@@ -17,7 +17,7 @@
     <dimen name="all_text_size_big">22sp</dimen>
     <dimen name="all_text_size_big_big">30sp</dimen>
     <dimen name="all_text_size_super_big">25sp</dimen>
-    <dimen name="all_margin_left">15dp</dimen>
+    <dimen name="all_margin_left">17dp</dimen>
     <dimen name="title_height">50dp</dimen>
     <dimen name="small_text_size">13sp</dimen>
     <dimen name="all_textview_width">120dp</dimen>
@@ -96,7 +96,7 @@
     <dimen name="et_height">44dp</dimen>
     <dimen name="et_textsize">16sp</dimen>
     <dimen name="et_padding">12dp</dimen>
-    <dimen name="et_margin_logo">40dp</dimen>
+    <dimen name="et_margin_logo">44dp</dimen>
     <dimen name="et_margin_edittext">20dp</dimen>
     <dimen name="drop_down_margin_right_et">20dp</dimen>
     <dimen name="smscodefragment_drop_get_sms_width">84dp</dimen>