Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java

@@ -388,11 +388,11 @@ public class StorePresenter extends StoreContract.Presenter {
      */
     private void getProductByBarcode(String barcode) {
         mView.showLoadingDialog();
-        List<Sssku> ssskus = DBFactory.getList(DB.getInstance().get(MainPresenter.class).where(Sssku.class)
+        List<Sssku> ssskus = DBFactory.getList(DB.getInstance().get(StorePresenter.class).where(Sssku.class)
                 .equalTo("spuBarcode", StringUtil.strToLong(barcode))
                 .equalTo("skuStatus", 0)
                 .findAll());
-        List<Ussku> usskus = DBFactory.getList(DB.getInstance().get(MainPresenter.class).where(Ussku.class)
+        List<Ussku> usskus = DBFactory.getList(DB.getInstance().get(StorePresenter.class).where(Ussku.class)
                 .equalTo("spuBarcode", StringUtil.strToLong(barcode))
                 .equalTo("skuStatus", 0)
                 .findAll());

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

@@ -134,7 +134,7 @@
                     android:hint="@string/sku_name_hint"
                     android:inputType="text"
                     android:labelFor="@+id/et_name"
-                    android:maxLength="16"
+                    android:maxLength="30"
                     android:saveEnabled="false"
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_body_size"