Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java

@@ -75,7 +75,8 @@ public class DBFactory {
 
             //skuStatus
             query.equalTo("skuStatus", 0);
-            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
+            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just
+                    (getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
         }
 
         /**
@@ -100,7 +101,8 @@ public class DBFactory {
 
             //skuStatus
             query.equalTo("skuStatus", 0);
-            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
+            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just
+                    (getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
         }
 
 
@@ -124,7 +126,8 @@ public class DBFactory {
          * @return 商品分组
          */
         public static Observable<List<Sskugrp>> querySkugrp() {
-            return Observable.just(DB.getInstance().get(StorePresenter.class).where(Sskugrp.class).findAll())
+            return Observable.just(DB.getInstance().get(StorePresenter.class).where(Sskugrp
+                    .class).findAll())
                     .flatMap(sskugrps -> Observable.just(getList(sskugrps)));
         }
 
@@ -136,7 +139,8 @@ public class DBFactory {
          * @return 商品名称
          */
         public static String querySpuNameBySkuId(Long skuId) {
-            List<Sssku> ssskus = getList(DB.getInstance().get(StorePresenter.class).where(Sssku.class).equalTo("skuId", skuId).findAll());
+            List<Sssku> ssskus = getList(DB.getInstance().get(StorePresenter.class).where(Sssku
+                    .class).equalTo("skuId", skuId).findAll());
             if (ssskus.size() > 0) return ssskus.get(0).getSpuName();
             else return null;
         }
@@ -152,14 +156,18 @@ public class DBFactory {
 
             query.notEqualTo("msTools", C.MS_TYPE.GIFT);
 
-            Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd", Locale.getDefault())));
-            query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo("msDateEnd", dateNow).endGroup();
+            Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd",
+                    Locale.getDefault())));
+            query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo
+                    ("msDateEnd", dateNow).endGroup();
 
             String weekNow = String.valueOf(TimeUtils.getWeekIndex(TimeUtils.getNowDate()));
             query.contains("msWeekPlan", weekNow);
 
-            Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss", Locale.getDefault())));
-            query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo("msTimeEnd", timeNow).endGroup();
+            Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss",
+                    Locale.getDefault())));
+            query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo
+                    ("msTimeEnd", timeNow).endGroup();
 
             query.equalTo("msCoustomTag", 0);
 
@@ -168,6 +176,7 @@ public class DBFactory {
                     .flatMap(ms -> Observable.just(getList(ms)));
         }
     }
+
     public static class Vip {
         /**
          * 查询支付渠道
@@ -183,6 +192,7 @@ public class DBFactory {
         }
 
     }
+
     public static class Settle {
         /**
          * 查询支付渠道
@@ -198,7 +208,6 @@ public class DBFactory {
         }
 
 
-
         /**
          * 查询营销活动
          *
@@ -210,14 +219,18 @@ public class DBFactory {
 
             query.notEqualTo("msTools", C.MS_TYPE.GIFT);
 
-            Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd", Locale.getDefault())));
-            query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo("msDateEnd", dateNow).endGroup();
+            Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd",
+                    Locale.getDefault())));
+            query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo
+                    ("msDateEnd", dateNow).endGroup();
 
             String weekNow = String.valueOf(TimeUtils.getWeekIndex(TimeUtils.getNowDate()));
             query.contains("msWeekPlan", weekNow);
 
-            Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss", Locale.getDefault())));
-            query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo("msTimeEnd", timeNow).endGroup();
+            Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss",
+                    Locale.getDefault())));
+            query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo
+                    ("msTimeEnd", timeNow).endGroup();
 
 
             return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING))
@@ -228,13 +241,15 @@ public class DBFactory {
     public static class Marketing {
         public static class Ms {
             public static Observable<List<Level>> queryLevel() {
-                return Observable.just(DB.getInstance().get(MainPresenter.class).where(Level.class).findAll())
+                return Observable.just(DB.getInstance().get(MainPresenter.class).where(Level
+                        .class).findAll())
                         .flatMap(levels -> Observable.just(getList(levels)));
             }
         }
     }
 
-    public static <E extends RealmModel> List<E> getLimitList(RealmResults<E> data, int offset, int limit) {
+    public static <E extends RealmModel> List<E> getLimitList(RealmResults<E> data, int offset,
+                                                              int limit) {
         List<E> obtainList = new ArrayList<>();
         Realm realm = Realm.getDefaultInstance();
         if (data.size() == 0) {
@@ -324,6 +339,15 @@ public class DBFactory {
         realm.commitTransaction();
     }
 
+    public static <T extends RealmObject & BaseModel> void deleteData(Class<T> tClass, String
+            field, String conditions) {
+        Realm realm = getRealm();
+        realm.beginTransaction();
+        RealmResults<T> modelLists = realm.where(tClass).equalTo(field, conditions).findAll();
+        modelLists.deleteAllFromRealm();
+        realm.commitTransaction();
+    }
+
     public static Realm getRealm() {
         Realm realm = Realm.getInstance(App.instance.mRealmConfig);
         realm.refresh();

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

@@ -68,7 +68,7 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
             mViewBinding.tvMerchantsname.setVisibility(View.VISIBLE);
             mViewBinding.tvMerchantsname.setText(LoginPresenter.userStoreInfo.getMerchant()
                     .getMerName
-                    ());
+                            ());
             mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getOperName());
         }
         mLoadingDialog.show((BaseActivity) getActivity());
@@ -236,17 +236,20 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
      * @return
      */
     private boolean isAllNull() {
-        boolean _isbl = false;
         if (startway == 1) {
             //注册创建门店
-            _isbl = mViewBinding.etNickname.getText().toString().isEmpty();
+            return !(mViewBinding.etNickname.getText().toString().isEmpty() || mViewBinding
+                    .etMerchantsname.getText().toString().isEmpty() ||
+                    mViewBinding.etStorename.getText().toString().isEmpty() || mViewBinding
+                    .tvStoredetailedaddress.getText().toString().isEmpty() || addressId == -1);
         } else if (startway == 2) {
             //登录后新建门店
-            _isbl = mViewBinding.tvNickname.getText().toString().isEmpty();
+            return !(mViewBinding.tvNickname.getText().toString().isEmpty() || mViewBinding
+                    .tvMerchantsname.getText().toString().isEmpty() ||
+                    mViewBinding.etStorename.getText().toString().isEmpty() || mViewBinding
+                    .tvStoredetailedaddress.getText().toString().isEmpty() || addressId == -1);
         }
-        return !(_isbl || mViewBinding.tvMerchantsname.getText().toString().isEmpty() ||
-                mViewBinding.etStorename.getText().toString().isEmpty() || mViewBinding
-                .tvStoredetailedaddress.getText().toString().isEmpty() || addressId == -1);
+        return false;
     }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/splash/SplashPresenter.java

@@ -10,11 +10,6 @@ import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.SPUtils;
 import com.blankj.utilcode.util.ToastUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.xingdata.zzdpos.App;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
@@ -36,6 +31,10 @@ import com.xingdata.zzdpos.util.INI;
 import com.xingdata.zzdpos.util.MultiThreadDownload;
 import com.xingdata.zzdpos.util.SystemUtil;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 public class SplashPresenter extends SplashContract.Presenter {
     Handler handler = new Handler();
     long apkLenth = 0;
@@ -48,6 +47,12 @@ public class SplashPresenter extends SplashContract.Presenter {
             nowPro += pro;
             mView.initProgress((int) nowPro);
             if (nowPro >= 100) {
+                DBFactory.deleteData(Oper.class, "operStatus", "9");
+//                DBFactory.deleteData(Sssku.class, "skuStatus", "9");
+//                DBFactory.deleteData(Ussku.class, "skuStatus", "9");
+//                DBFactory.deleteData(Ds.class, "dsStatus", "9");
+//                DBFactory.deleteData(Ms.class, "msStatus", "9");
+//                DBFactory.deleteData(Mscard.class, "cruleStatus", "9");
                 mView.initComplete();
             }
         }

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

@@ -106,7 +106,6 @@
                 android:onClick="@{OnClickListener}"
                 android:stateListAnimator="@null"
                 android:text="取 消"
-                android:textColor="@drawable/selector_gradient_gray_button_background"
                 android:textSize="@dimen/et_textsize"/>
 
             <Button

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

@@ -33,24 +33,26 @@
                 android:src="@mipmap/login_logo"/>
 
 
-
             <EditText
                 android:id="@+id/et_one_password"
                 style="@style/editText_new"
                 android:layout_marginTop="@dimen/et_margin_edittext"
                 android:digits="1234567890"
                 android:drawableLeft="@mipmap/login_pwd01"
+                android:drawablePadding="@dimen/all_padding"
                 android:ems="10"
                 android:hint="@string/login_smscodefragment_et_one_input_password_hint"
                 android:inputType="textPassword"
                 android:maxLength="8"
                 />
+
             <EditText
                 android:id="@+id/et_two_password"
                 style="@style/editText_new"
                 android:layout_marginTop="@dimen/et_margin_edittext"
                 android:digits="1234567890"
                 android:drawableLeft="@mipmap/pwd_two01"
+                android:drawablePadding="@dimen/all_padding"
                 android:ems="10"
                 android:hint="@string/login_smscodefragment_et_two_input_password_hint"
                 android:inputType="textPassword"

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

@@ -37,6 +37,7 @@
                 style="@style/editText_new"
                 android:digits="1234567890"
                 android:drawableLeft="@mipmap/login_username1"
+                android:drawablePadding="@dimen/all_padding"
                 android:ems="10"
                 android:hint="@string/login_et_phone_hint"
                 android:inputType="phone"
@@ -71,6 +72,7 @@
             android:layout_marginTop="@dimen/et_margin_edittext"
             android:digits="1234567890"
             android:drawableLeft="@mipmap/login_pwd01"
+            android:drawablePadding="@dimen/all_padding"
             android:ems="10"
             android:hint="@string/login_et_password_hint"
             android:inputType="textPassword"

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

@@ -41,6 +41,7 @@
                     style="@style/editText_new"
                     android:digits="1234567890"
                     android:drawableLeft="@mipmap/login_username1"
+                    android:drawablePadding="@dimen/all_padding"
                     android:ems="10"
                     android:gravity="center_vertical"
                     android:hint="@string/login_et_phone_hint"
@@ -82,6 +83,7 @@
                 android:layout_marginTop="@dimen/all_margin"
                 android:digits="1234567890"
                 android:drawableLeft="@mipmap/sms01"
+                android:drawablePadding="@dimen/all_padding"
                 android:ems="10"
                 android:hint="@string/login_smscodefragment_et_input_sms_hint"
                 android:inputType="phone|number"

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

@@ -13,8 +13,7 @@
                                                  android:layout_width="match_parent"
                                                  android:layout_height="150dp"
                                                  android:layout_marginBottom="@dimen/all_padding"
-                                                 android:foreground="?android:attr/selectableItemBackground"
-                                                 android:padding="@dimen/all_margin">
+                                                 android:foreground="?android:attr/selectableItemBackground">
 
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/iv_pic"
@@ -99,6 +98,7 @@
             android:gravity="center"
             android:orientation="horizontal"
             android:visibility="visible"
+            app:layout_constraintLeft_toRightOf="@+id/tv_money"
             app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
             app:layout_constraintEnd_toEndOf="parent">
 
@@ -106,7 +106,7 @@
                 android:id="@+id/btn_down"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/all_margin"
+                android:layout_marginEnd="@dimen/all_padding"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:onClick="@{onClick}"
@@ -136,7 +136,7 @@
                 android:id="@+id/btn_up"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/all_margin"
+                android:layout_marginStart="@dimen/all_padding"
                 android:layout_weight="1"
                 android:background="@color/white"
                 android:onClick="@{onClick}"