Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/RiceponAddOrderBean.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java

arms/src/main/java/com/jess/arms/base/BaseActivity.java

@@ -18,6 +18,7 @@ package com.jess.arms.base;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.View;
@@ -33,6 +34,7 @@ import com.jess.arms.integration.lifecycle.ActivityLifecycleable;
 import com.jess.arms.mvp.IPresenter;
 import com.jess.arms.utils.AndroidWorkaround;
 import com.jess.arms.utils.ArmsUtils;
+import com.qmuiteam.qmui.util.QMUIDeviceHelper;
 import com.trello.rxlifecycle2.android.ActivityEvent;
 
 import javax.inject.Inject;
@@ -90,6 +92,10 @@ public abstract class BaseActivity<P extends IPresenter> extends AppCompatActivi
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = this;
+        if (!QMUIDeviceHelper.isTablet(this)) {
+            //手機端直接強制竖屏
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         //DecorView的背景对我来说无用，但是会产生一次Overdraw,这里去掉（过度绘制优化）
         getWindow().setBackgroundDrawable(null);
         try {

arms/src/main/java/com/jess/arms/base/BaseFragmentActivity.java

@@ -17,6 +17,7 @@ package com.jess.arms.base;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
@@ -32,6 +33,8 @@ import com.jess.arms.integration.cache.CacheType;
 import com.jess.arms.integration.lifecycle.ActivityLifecycleable;
 import com.jess.arms.mvp.IPresenter;
 import com.jess.arms.utils.ArmsUtils;
+import com.jess.arms.utils.DeviceUtils;
+import com.qmuiteam.qmui.util.QMUIDeviceHelper;
 import com.trello.rxlifecycle2.android.ActivityEvent;
 
 import javax.inject.Inject;
@@ -101,6 +104,10 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends Fragmen
 //                .init();
         mDelegate.onCreate(savedInstanceState);
         mContext = this;
+        if (!QMUIDeviceHelper.isTablet(this)) {
+            //手機端直接強制竖屏
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         //DecorView的背景对我来说无用，但是会产生一次Overdraw,这里去掉（过度绘制优化）
         getWindow().setBackgroundDrawable(null);
         try {
@@ -227,7 +234,6 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends Fragmen
     /****************************************以下为可选方法(Optional methods)******************************************************/
 
     // 选择性拓展其他方法
-
     public void loadRootFragment(int containerId, @NonNull ISupportFragment toFragment) {
         mDelegate.loadRootFragment(containerId, toFragment);
     }
@@ -304,6 +310,7 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends Fragmen
     public boolean useEventBus() {
         return true;
     }
+
     /**
      * 这个Activity是否会使用Fragment,框架会根据这个属性判断是否注册
      * 如果返回false,那意味着这个Activity不需要绑定Fragment,那你再在这个Activity中绑定继承于 {@link BaseFragment} 的Fragment将不起任何作用

base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java

@@ -36,7 +36,7 @@ import com.gingersoft.gsa.cloud.constans.UserConstans;
 import com.gingersoft.gsa.cloud.database.DaoManager;
 import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
 import com.gingersoft.gsa.cloud.database.utils.ExpandInfoDaoUtils;
-import com.gingersoft.gsa.cloud.table.RestaurantExpandInfo;
+import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo;
 import com.hyweb.n5.lib.exception.NoInitPrinterException;
 import com.hyweb.n5.lib.util.PrinterUtil;
 import com.jess.arms.base.BaseApplication;
@@ -105,7 +105,7 @@ public class GsaCloudApplication extends BaseApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        this.mAppContext = this;
+        mAppContext = this;
         CC.enableVerboseLog(true);
         CC.enableDebug(true);
         CC.enableRemoteCC(true);

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java

@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.base.utils;
 import android.text.TextUtils;
 
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.table.RestaurantExpandInfo;
+import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo;
 import com.gingersoft.gsa.cloud.constans.ExpandConstant;
 import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java

 package com.gingersoft.gsa.cloud.base.utils.okhttpUtils;
 
+import com.gingersoft.gsa.cloud.base.BuildConfig;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
 import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;

base-module/src/main/java/com/gingersoft/gsa/cloud/table/PublicBean.java → base-module/src/main/java/com/gingersoft/gsa/cloud/bean/PublicBean.java

-package com.gingersoft.gsa.cloud.table;
+package com.gingersoft.gsa.cloud.bean;
 
 public class PublicBean {
     private boolean success;

base-module/src/main/java/com/gingersoft/gsa/cloud/table/RestaurantExpandInfo.java → base-module/src/main/java/com/gingersoft/gsa/cloud/bean/RestaurantExpandInfo.java

-package com.gingersoft.gsa.cloud.table;
+package com.gingersoft.gsa.cloud.bean;
 
 import lombok.Data;
 
@@ -18,7 +18,7 @@ public class RestaurantExpandInfo {
          * 食品組、食品、細項、折扣行列寬高
          */
         private int foodGroupRow = 2;
-        private int foodGroupColumn = 6;
+        private int foodGroupColumn = 5;
         private int foodColumn = 4;
         private int comboColumn = 4;
         private int modColumn = 4;

base-module/src/main/java/com/gingersoft/gsa/cloud/table/WiseposBean.java → base-module/src/main/java/com/gingersoft/gsa/cloud/bean/WiseposBean.java

-package com.gingersoft.gsa.cloud.table;
+package com.gingersoft.gsa.cloud.bean;
 
 public class WiseposBean {
 

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/contract/OrderDetailsContract.java

@@ -4,7 +4,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.CancelLogisticsBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 import com.jess.arms.mvp.IModel;
 import com.jess.arms.mvp.IView;

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/model/OrderDetailsModel.java

@@ -8,7 +8,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
 import com.gingersoft.coldchain_module.mvp.model.service.OrderDetailService;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 import com.google.gson.Gson;
 import com.jess.arms.di.scope.ActivityScope;

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/model/service/OrderDetailService.java

@@ -4,7 +4,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.CancelLogisticsBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ReadBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
 import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 
 import io.reactivex.Observable;

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderDetailsPresenter.java

@@ -14,7 +14,7 @@ import com.gingersoft.gsa.cloud.base.utils.FileUtils;
 import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
 import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;

config.gradle

@@ -119,6 +119,8 @@ ext {
             "zxing"                    : "cn.yipianfengye.android:zxing-library:2.2",
             "BaseRecyclerViewAdapter"  : "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4",
             "yzjRecyclerView"          : "com.yanzhenjie.recyclerview:x:1.3.2",
+            //搜索view
+            "MultiSearchView"          : "com.github.iammert:MultiSearchView:0.3",
 
             // 狀態欄基础依赖包，必须要依赖
             "immersionbar"             : "com.gyf.immersionbar:immersionbar:3.0.0",

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/BaseLoginContract.java

 package com.gingersoft.gsa.cloud.login.mvp.contract;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/model/BaseLoginModel.java

@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.login.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.contract.BaseLoginContract;
 import com.gingersoft.gsa.cloud.login.mvp.server.LoginService;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java

@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.constans.AppConstans;
 import com.gingersoft.gsa.cloud.constans.PrintConstans;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/server/LoginService.java

 package com.gingersoft.gsa.cloud.login.mvp.server;
 
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
 

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/contract/ChooseRestaurantContract.java

 package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.contract;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.jess.arms.mvp.IView;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/model/ChooseRestaurantModel.java

@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.server.LoginService;
 import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
 import com.google.gson.Gson;

login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/presenter/ChooseRestaurantPresenter.java

@@ -4,7 +4,7 @@ import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.contract.ChooseRestaurantContract;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.LoginActivity;

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/MainActivity.java

@@ -65,11 +65,6 @@ public class MainActivity extends BaseFragmentActivity<MainPresenter> implements
                 .inject(this);
     }
 
-//    @Override
-//    protected int getContextViewId() {
-//        return R.layout.main_activity_main;
-//    }
-
     @Override
     public int initView(@Nullable Bundle savedInstanceState) {
         return R.layout.main_activity_main; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0

print-module/src/main/java/com/joe/print/mvp/contract/LocalPrintContract.java

 package com.joe.print.mvp.contract;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;

print-module/src/main/java/com/joe/print/mvp/contract/PrintAddCurrencyContract.java

 package com.joe.print.mvp.contract;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.jess.arms.mvp.IView;
 import com.jess.arms.mvp.IModel;
 

print-module/src/main/java/com/joe/print/mvp/model/LocalPrintModel.java

@@ -2,7 +2,7 @@ package com.joe.print.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.google.gson.Gson;
 import com.jess.arms.integration.IRepositoryManager;
 import com.jess.arms.mvp.BaseModel;

print-module/src/main/java/com/joe/print/mvp/model/PrintAddCurrencyModel.java

@@ -2,7 +2,7 @@ package com.joe.print.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.google.gson.Gson;
 import com.jess.arms.integration.IRepositoryManager;
 import com.jess.arms.mvp.BaseModel;

print-module/src/main/java/com/joe/print/mvp/model/server/PrintInfoService.java

@@ -2,7 +2,7 @@ package com.joe.print.mvp.model.server;
 
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 
 import io.reactivex.Observable;
 import me.jessyan.retrofiturlmanager.RetrofitUrlManager;

print-module/src/main/java/com/joe/print/mvp/presenter/LocalPrintPresenter.java

@@ -3,7 +3,7 @@ package com.joe.print.mvp.presenter;
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.jess.arms.di.scope.FragmentScope;
 import com.jess.arms.http.imageloader.ImageLoader;

print-module/src/main/java/com/joe/print/mvp/presenter/PrintAddCurrencyPresenter.java

@@ -3,7 +3,7 @@ package com.joe.print.mvp.presenter;
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.table.PublicBean;
+import com.gingersoft.gsa.cloud.bean.PublicBean;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java

@@ -51,6 +51,7 @@ import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.utils.RxLifecycleUtils;
+import com.qmuiteam.qmui.util.QMUIDeviceHelper;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 
@@ -1243,8 +1244,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
 //        }
     }
 
-    private void setModifierSoldoutCtrData
-            (List<Modifier> modifierList, List<SoldoutCtrFood> soldoutCtrFoods) {
+    private void setModifierSoldoutCtrData(List<Modifier> modifierList, List<SoldoutCtrFood> soldoutCtrFoods) {
         for (SoldoutCtrFood scc : soldoutCtrFoods) {
             for (Modifier modifier : modifierList) {
                 if (scc.getType() == MODIFIER_TYPE && scc.getModifierId() != null && modifier.getMid() != 0 && modifier.getMid() == scc.getModifierId()) {
@@ -1655,8 +1655,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
                 }
             }
         }
-        if (adapter != null)
+        if (adapter != null) {
             adapter.notifyDataSetChanged();
+        }
     }
 
     private String getOrderFoodNumber() {