1、去掉所有layout fitsSystemWindows属性

component-main/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java

@@ -56,9 +56,9 @@ public class ComponentMain implements IComponent {
          */
         public static final FModule[] employee = {
                 new FModule("main/employee", 0, 0),
-                new FModule("main/employee/management", R.drawable.ic_staff_management, R.drawable.ic_staff_management_close),
-                new FModule("main/employee/delivery", R.drawable.ic_authority_management, R.drawable.ic_authority_management_close),
-                new FModule("main/employee/operationRecord", R.drawable.ic_operation_record, R.drawable.ic_operation_record_close)
+                new FModule("main/employee/management", R.drawable.ic_staff_management_close, R.drawable.ic_staff_management_close),
+                new FModule("main/employee/delivery", R.drawable.ic_authority_management_close, R.drawable.ic_authority_management_close),
+                new FModule("main/employee/operationRecord", R.drawable.ic_operation_record_close, R.drawable.ic_operation_record_close)
         };
     }
 

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.widget.BaseAdapter;
+
 import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
 import com.gingersoft.gsa.cloud.main.R;
 import com.gingersoft.gsa.cloud.main.R2;
@@ -13,6 +14,7 @@ import com.gingersoft.gsa.cloud.main.mvp.presenter.MainPresenter;
 import com.gingersoft.gsa.cloud.main.mvp.ui.fragment.HomeFragment;
 import com.gingersoft.gsa.cloud.main.mvp.ui.fragment.MyFragment;
 import com.gingersoft.gsa.cloud.main.mvp.ui.fragment.ReportListFragment;
+import com.gyf.immersionbar.ImmersionBar;
 import com.jess.arms.base.BaseFragmentActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
@@ -68,6 +70,11 @@ public class MainActivity extends BaseFragmentActivity<MainPresenter> implements
     }
 
     @Override
+    public void configImmersionBar(ImmersionBar immersionBar) {
+        immersionBar.init();
+    }
+
+    @Override
     public int initView(@Nullable Bundle savedInstanceState) {
         return R.layout.main_activity_main; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
     }
@@ -94,7 +101,7 @@ public class MainActivity extends BaseFragmentActivity<MainPresenter> implements
 
             @Override
             public int getCount() {
-                return 3;
+                return 2;
             }
 
             @Override
@@ -123,15 +130,15 @@ public class MainActivity extends BaseFragmentActivity<MainPresenter> implements
                 .setSelectedDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_selected_report))
                 .setText(getString(R.string.report))
                 .build(mContext);
-        QMUITab my = builder
-                .setNormalDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_normal_my))
-                .setSelectedDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_selected_my))
-                .setText(getString(R.string.my))
-                .build(mContext);
+//        QMUITab my = builder
+//                .setNormalDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_normal_my))
+//                .setSelectedDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_selected_my))
+//                .setText(getString(R.string.my))
+//                .build(mContext);
 
         mTabSegment.addTab(home)
-                .addTab(report)
-                .addTab(my);
+                .addTab(report);
+//                .addTab(my);
 
     }
 

component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/MainOrderingAdapter.java

@@ -21,10 +21,6 @@ public class MainOrderingAdapter extends BaseQuickAdapter<Function, BaseViewHold
         super(layoutResId, data);
     }
 
-//    public MainOrderingAdapter(@Nullable List<SectionItem> data) {
-//        super(R.layout.main_home_funcation_item, data);
-//    }
-
     @Override
     protected void convert(BaseViewHolder helper, Function item) {
         helper.setImageResource(R.id.iv_main_home_item_function_icon, item.getIcRes());

component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/HomeFragment.java

@@ -105,7 +105,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
  * ================================================
  * 首頁
  */
-public class HomeFragment extends BaseFragment<HomePresenter> implements HomeContract.View, View.OnClickListener , Handler.Callback{
+public class HomeFragment extends BaseFragment<HomePresenter> implements HomeContract.View, View.OnClickListener {
 
     @BindView(R2.id.rv_side_menu)
     RecyclerView mRvSideMenu;
@@ -172,13 +172,17 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
     }
 
     @Override
-    public View initView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.main_fragment_home, container, false);
+    public void configImmersionBar(ImmersionBar immersionBar) {
+        immersionBar
+                .statusBarColor(R.color.gray)
+                .barColor(R.color.gray)
+                .fitsSystemWindows(true)
+                .init();
     }
 
     @Override
-    public boolean handleMessage(@NonNull Message msg) {
-        return false;
+    public View initView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.main_fragment_home, container, false);
     }
 
     @Override
@@ -186,16 +190,10 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
         super.onActivityCreated(savedInstanceState);
         mPresenter.checkAppVersion();
         mPresenter.syncRestaurantExtendedConfiguration();
-
-        WeakHandler weakHandler = new WeakHandler(this);
-        weakHandler.sendEmptyMessage(0);
     }
 
-
     @Override
     public void initData(@Nullable Bundle savedInstanceState) {
-        ImmersionBar.with(_mActivity).titleBar(R.id.cl_title_layout).init();
-        ImmersionBar.with(_mActivity).titleBar(R.id.side_layout).navigationBarAlpha(1).init();
         //初始化側邊欄菜單項
         initSideMenu();
 
@@ -209,7 +207,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
 //                msg.what = 0;
 //                mainTopFragment.setData(msg);
 //            }
-            EventBus.getDefault().post(true,"onRefreshReport");
+            EventBus.getDefault().post(true, "onRefreshReport");
         });
         refresh.setEnableLoadMore(false);
 //        initFuncationData();
@@ -229,7 +227,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
     }
 
     @Subscriber(tag = "onFinishRefresh")
-    private void onFinishRefresh(boolean state){
+    private void onFinishRefresh(boolean state) {
         refresh.finishRefresh();
     }
 
@@ -358,6 +356,9 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
 
         List<Function> employeeFuncations = FunctionManager.getDefault().getFunctionByResModule(_mActivity, ComponentMain.main.class, ComponentMain.main.employee, "employee");
         if (employeeFuncations.size() > 0) {
+            for (Function function : employeeFuncations) {
+                function.setStatus(0);
+            }
             functions.addAll(employeeFuncations);
             ll_staff_management.setVisibility(View.VISIBLE);
         } else {

component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/ReportListFragment.java

@@ -22,6 +22,7 @@ import com.gingersoft.gsa.cloud.main.mvp.contract.ReportListContract;
 import com.gingersoft.gsa.cloud.main.mvp.model.bean.ReportListItem;
 import com.gingersoft.gsa.cloud.main.mvp.presenter.ReportListPresenter;
 import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.ReportListAdapter;
+import com.gyf.immersionbar.ImmersionBar;
 import com.jess.arms.base.BaseFragment;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
@@ -56,7 +57,6 @@ public class ReportListFragment extends BaseFragment<ReportListPresenter> implem
 
     private ReportListAdapter mReportListAdapter;
 
-
     public static ReportListFragment newInstance() {
         ReportListFragment fragment = new ReportListFragment();
         return fragment;
@@ -73,6 +73,14 @@ public class ReportListFragment extends BaseFragment<ReportListPresenter> implem
     }
 
     @Override
+    public void configImmersionBar(ImmersionBar immersionBar) {
+        immersionBar
+                .statusBarColor(R.color.red)
+                .barColor(R.color.red)
+                .init();
+    }
+
+    @Override
     public View initView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_report_list, container, false);
     }

component-main/src/main/res/layout/fragment_report_list.xml

@@ -12,7 +12,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:descendantFocusability="afterDescendants"
     android:orientation="vertical">
 
     <com.qmuiteam.qmui.widget.QMUITopBar

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

@@ -110,36 +110,74 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
     @Inject
     AppManager mAppManager;
 
-    @Inject
-    @Named("foodList")
-    List<Food> mFoodList;
-    @Inject
-    List<ComboItem> mFoodComboList; //套餐细项数据
-    @Inject
-    List<Modifier> mModifierList; //细项数据
-    @Inject
-    List<Discount> mDiscountList; //折扣数据
-    @Inject
-    List<SoldoutCtrFood> mSoldoutCtrList;//沽清食品數據
-
-    @Inject
-    FoodAdapter mFoodAdapter;
-    @Inject
-    ComboAdapter mComboAdapter;
-    @Inject
-    ModifierAdapter mModifierAdapter;
-    @Inject
-    DiscountAdapter mDiscountAdapter;
+//    @Inject
+//    @Named("foodList")
+//    List<Food> mFoodList;
+//    @Inject
+//    List<ComboItem> mFoodComboList; //套餐细项数据
+//    @Inject
+//    List<Modifier> mModifierList; //细项数据
+//    @Inject
+//    List<Discount> mDiscountList; //折扣数据
+//    @Inject
+//    List<SoldoutCtrFood> mSoldoutCtrList;//沽清食品數據
+//
+//    @Inject
+//    FoodAdapter mFoodAdapter;
+//    @Inject
+//    ComboAdapter mComboAdapter;
+//    @Inject
+//    ModifierAdapter mModifierAdapter;
+//    @Inject
+//    DiscountAdapter mDiscountAdapter;
+//
+//    private MealStandActivity IActivity;
+//
+//    private CancelFoodDialog mCancelFoodDialog;
+//
+//    private MealDiscountAction mMealDiscountAction;
+//
+//    private OrderDetail mCurrentOrderDetailBean;
+//    private boolean RvMealClicked;
 
     private MealStandActivity IActivity;
 
     private CancelFoodDialog mCancelFoodDialog;
 
+    private FoodAdapter mFoodAdapter;
+    private ComboAdapter mComboAdapter;
+    private ModifierAdapter mModifierAdapter;
+    private DiscountAdapter mDiscountAdapter;
+    /**
+     * 食品数据
+     */
+    private List<Food> mFoodGroupList = new ArrayList<>();
+    /**
+     * 當前食品組下食品
+     */
+    private List<Food> mFoodList = new ArrayList<>();
+
+    /**
+     * 套餐细项数据
+     */
+    private List<ComboItem> mFoodComboList = new ArrayList<>();
+    private List<Modifier> mModifierList = new ArrayList<>();
+    /**
+     * 折扣数据
+     */
+    private List<Discount> mDiscountList = new ArrayList<>();
+
+    /**
+     * 沽清食品數據
+     */
+    private List<SoldoutCtrFood> mSoldoutCtrList = new ArrayList<>();
+
     private MealDiscountAction mMealDiscountAction;
 
     private OrderDetail mCurrentOrderDetailBean;
     private boolean RvMealClicked;
 
+
     @Inject
     public MealStandPresenter(MealStandContract.Model model, MealStandContract.View rootView) {
         super(model, rootView);
@@ -215,7 +253,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
 
         if (foodGroupList != null && foodGroupList.size() > 0) {
 
-            mRootView.getFoodGroupList().addAll(foodGroupList);
+//            mRootView.getFoodGroupList().addAll(foodGroupList);
+
+            mFoodGroupList.addAll(foodGroupList);
 
             Food defalutFoodGroup = getDefalutFoodGroup(mRootView.getFoodGroupList());
             if (defalutFoodGroup != null) {
@@ -251,15 +291,15 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
             mRootView.setFoodAdapter(mFoodAdapter);
         }
         if (mComboAdapter == null) {
-//            mComboAdapter = new ComboAdapter(IActivity, mFoodComboList);
+            mComboAdapter = new ComboAdapter(IActivity, mFoodComboList);
             mRootView.setComboAdapter(mComboAdapter);
         }
         if (mModifierAdapter == null) {
-//            mModifierAdapter = new ModifierAdapter(IActivity, mModifierList);
+            mModifierAdapter = new ModifierAdapter(IActivity, mModifierList);
             mRootView.setModifierAdapter(mModifierAdapter);
         }
         if (mDiscountAdapter == null) {
-//            mDiscountAdapter = new DiscountAdapter(IActivity, mDiscountList);
+            mDiscountAdapter = new DiscountAdapter(IActivity, mDiscountList);
             mRootView.setDiscountAdapter(mDiscountAdapter);
         }
     }

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java

@@ -284,10 +284,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
     private ImageView[] ivPoints;
     private int mPageIndex;
     private int totalPage;
-    @Inject
-    @Named("foodGroupList")
+//    @Inject
+//    @Named("foodGroupList")
     List<Food> mFoodGroupList;
-    @Inject
+//    @Inject
     FoodGroupAdapter mFoodGroupAdapter;
 
     private PagerGridLayoutManager mLayoutManager;
@@ -427,9 +427,9 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
         PagerConfig.setShowLog(true);
 
         // 使用原生的 Adapter 即可
-//        mFoodGroupAdapter = new FoodGroupAdapter(this, foodGroupList, 1);
+        mFoodGroupAdapter = new FoodGroupAdapter(this, foodGroupList, 1);
 
-        mFoodGroupAdapter.setFoodGroupList(mFoodGroupList);
+//        mFoodGroupAdapter.setFoodGroupList(mFoodGroupList);
         rv_food_group.setAdapter(mFoodGroupAdapter);
         mFoodGroupAdapter.setOnItemClickListener(new FoodGroupAdapter.OnItemClickListener() {
             @Override

component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/discount/DiscountDialogFragment.java

@@ -63,7 +63,7 @@ public class DiscountDialogFragment extends BaseDialogFragment<BasePresenter> {
 
     private final String TAG = "DiscountFragment";
 
-//    @BindView(R2.id.topbar)
+    //    @BindView(R2.id.topbar)
 //    QMUITopBar topbar;
     @BindView(R2.id.tabSegment)
     QMUITabSegment tabSegment;
@@ -79,7 +79,6 @@ public class DiscountDialogFragment extends BaseDialogFragment<BasePresenter> {
     private List<String> mTabTitles = new ArrayList<>();
     private int mCurrentPageIndex = 0;
 
-
     public static DiscountDialogFragment newInstance() {
         DiscountDialogFragment fragment = new DiscountDialogFragment();
         return fragment;
@@ -98,17 +97,14 @@ public class DiscountDialogFragment extends BaseDialogFragment<BasePresenter> {
     @Override
     public void onStart() {
         super.onStart();
-        Window dialogWindow = getDialog().getWindow();
-        if (dialogWindow != null) {
-            dialogWindow.getDecorView().setPadding(0, 0, 0, 0);
-            dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-            WindowManager.LayoutParams lp = dialogWindow.getAttributes();
+        mWindow.getDecorView().setPadding(0, 0, 0, 0);
+        mWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        WindowManager.LayoutParams lp = mWindow.getAttributes();
         lp.width = WindowManager.LayoutParams.MATCH_PARENT;
         lp.height = (int) (QMUIDisplayHelper.getScreenHeight(mContext) * 0.6);
         lp.gravity = Gravity.BOTTOM;
         lp.windowAnimations = android.R.style.Animation_InputMethod;
-            dialogWindow.setAttributes(lp);
-        }
+        mWindow.setAttributes(lp);
     }
 
     @Override

component-table/src/main/res/layout/activitiy_coordinator.xml

@@ -34,7 +34,7 @@
 <!--        android:layout_width="match_parent"-->
 <!--        android:layout_height="wrap_content"-->
 <!--        android:layout_gravity="bottom"-->
-<!--        android:fitsSystemWindows="true"/>-->
+<!--       />-->
 
 <!--    <com.google.android.material.floatingactionbutton.FloatingActionButton-->
 <!--        android:id="@+id/fab"-->

library-base/src/main/java/com/jess/arms/base/BaseDialogFragment.java

@@ -23,6 +23,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.animation.Animation;
 
 import androidx.annotation.NonNull;
@@ -73,6 +74,7 @@ public abstract class BaseDialogFragment<P extends IPresenter> extends AppCompat
 
     final SupportFragmentDelegate mDelegate = new SupportFragmentDelegate(this);
     protected BaseFragmentActivity _mActivity;
+    protected Window mWindow;
 
     @NonNull
     @Override
@@ -149,6 +151,15 @@ public abstract class BaseDialogFragment<P extends IPresenter> extends AppCompat
         return view;
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        Dialog dialog = getDialog();
+        //点击外部消失
+        dialog.setCanceledOnTouchOutside(true);
+        mWindow = dialog.getWindow();
+    }
+
     @Nullable
     @Override
     public View getView() {