1、單點登錄跳轉調整

public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java

@@ -543,7 +543,8 @@ public class OrderDetail implements Serializable {
         orderDetail.setProductName(foods.getFoodName());
         orderDetail.setId(foods.getId());
         orderDetail.setProductId(foods.getId());
-        orderDetail.setParentId(0);
+//        orderDetail.setParentId(0);
+        orderDetail.setParentId(foods.getParentId());
         orderDetail.setUnit_price(foods.getPrice());
         orderDetail.setPrice(number * orderDetail.getUnit_price());
         orderDetail.setNumber(number);

public-base/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java

@@ -94,6 +94,8 @@ public class MyResponseErrorListener implements ResponseErrorListener {
             context.finish();
             dialog.dismiss();
         });
+        dialogBuilder.setCancelable(false);
+        dialogBuilder.setCanceledOnTouchOutside(false);
         dialogBuilder.create(R.style.MyDialogTheme2).show();
     }
 

public-base/src/main/res/layout/ui_dialog_choose_restaurant.xml

@@ -13,7 +13,6 @@
         android:fitsSystemWindows="true"
         app:qmui_topbar_title_color="@color/theme_white_color" />
 
-
     <com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout
         android:id="@+id/section_layout"
         android:layout_width="match_parent"

table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java

@@ -61,6 +61,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
 
     private Activity IActivity;
     private OrderContentActivity mOrderContentActivity;
+    private MealStandPresenter mMealStandPresenter;
 
     //订单数据管理类
     protected MyOrderManage myOrderManage;
@@ -95,6 +96,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
         if (IActivity instanceof OrderContentActivity) {
             mOrderContentActivity = (OrderContentActivity) IActivity;
         }
+        if (this instanceof MealStandPresenter) {
+            mMealStandPresenter = (MealStandPresenter) this;
+        }
 
         recalcOrderMoneyCount();
         resetSelected();
@@ -152,7 +156,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
 
             @Override
             public void onMealCountAdd(OrderDetail datasBean, int position) {
-                changeNumber(datasBean.getNumber() +1);
+                changeNumber(datasBean.getNumber() + 1);
                 recalcOrderMoneyCount();
                 if (mOrderContentActivity != null) {
                     mOrderContentActivity.initOrderDetail();
@@ -188,11 +192,15 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
                 });
     }
 
+
     public void changeNumber(int number) {
         if (!changeNumberCondition(number)) {
             return;
         }
         myOrderManage.changeNumber(number);
+        if (mMealStandPresenter != null) {
+            mMealStandPresenter.updateOrderFoodNumber();
+        }
         mSelectMealAdapter.notifyDataSetChanged();
     }
 
@@ -218,9 +226,10 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
 
     /**
      * 創建訂單后保存OrderId
+     *
      * @param orderId
      */
-    protected void setOrderId(double orderId){
+    protected void setOrderId(double orderId) {
         OrderBean orderBean = new OrderBean();
         orderBean.setId((int) orderId);
         MyOrderManage.getInstance().setOrderBean(orderBean);

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

@@ -719,15 +719,13 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
 //                }
 //            }
 //        }
-
         return true;
     }
 
-    public void updateOrderFoodNumber() {
 
+    public void updateOrderFoodNumber() {
         setFoodBtnNumber();
         setFoodGroupBtnNumber(IActivity.getFoodGroupGridViewAdapter(), mFoodGroupList);
-
         mRootView.setOrderFoodCount(getOrderFoodNumber());
     }
 
@@ -755,7 +753,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
             if (getOrderFoodLists() != null) {
                 for (int j = 0; j < getOrderFoodLists().size(); j++) {
                     OrderDetail food = getOrderFoodLists().get(j);
-                    if (food.isNew() && food.getId() == foodBean.getId()) {
+                    if (food.isNew() && food.getParentId() == foodBean.getId()) {
                         iNumber = iNumber + food.getNumber();
                         foodBean.setNumber(iNumber);
                     }

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

@@ -309,7 +309,11 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
         //总的页数向上取整
         totalPage = (int) Math.ceil(foodGroupList.size() * 1.0 / GoldConstants.foodGriupPageSize);
 
-        mLayoutManager = new PagerGridLayoutManager(GoldConstants.foodGriupRows, GoldConstants.foodGriupColumns, PagerGridLayoutManager.HORIZONTAL);
+        int Rows = GoldConstants.foodGriupRows;
+        if (foodGroupList.size() <= GoldConstants.foodGriupColumns) {
+            Rows = 1;
+        }
+        mLayoutManager = new PagerGridLayoutManager(Rows, GoldConstants.foodGriupColumns, PagerGridLayoutManager.HORIZONTAL);
 
         // 水平分页布局管理器
         mLayoutManager.setPageListener(this);    //设置页面变化监听器
@@ -348,34 +352,8 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
                 mPresenter.changedMealByParentId(datasBean.getId());
             }
         });
-//        viewPagerList = new ArrayList<>();
-//        for (int i = 0; i < totalPage; i++) {
-//            //每个页面都是inflate出一个新实例
-//            LineGridView gridView = (LineGridView) View.inflate(this, R.layout.meal_food_group_grid, null);
-//            gridView.setNumColumns(GoldConstants.foodGriupColCount);
-//            HorizontalGridViewAdpter horizontalGridViewAdpter = new HorizontalGridViewAdpter(this, foodGroupList, i, GoldConstants.foodGriupPageSize);
-//            gridView.setAdapter(horizontalGridViewAdpter);
-//            if (i == 0) {
-//                mFoodGroupAdapter = horizontalGridViewAdpter;
-//            }
-//            //添加item点击监听
-//            horizontalGridViewAdpter.setOnItemClickListener((food, position) -> {
-//                recordOperat(true);
-//                if (!ViewUtils.isFastClick2()) {
-//                    return;
-//                }
-//                if (!foodGroupConditionFilter(food, false)) {
-//                    return;
-//                }
-//                mFoodGroupAdapter = horizontalGridViewAdpter;
-//                mPresenter.setRvMealClicked(false);
-//                mPresenter.changedMealByParentId(food.getId());
-//            });
-//            //每一个GridView作为一个View对象添加到ViewPager集合中
-//            viewPagerList.add(gridView);
-//        }
-//
-        int mParentColHeight = GsaCloudApplication.androidSetting.getLayoutFoodTypeHeight() / GsaCloudApplication.androidSetting.getFoodTypeRow() * 2;
+
+        int mParentColHeight = GsaCloudApplication.androidSetting.getLayoutFoodTypeHeight() / GsaCloudApplication.androidSetting.getFoodTypeRow() * Rows;
 
         //设置ViewPager适配器
         rv_food_group.setLayoutParams(new LinearLayout.LayoutParams(
@@ -406,21 +384,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
         } else {
             ll_food_group_point.setVisibility(View.GONE);
         }
-//        //设置ViewPager的滑动监听，主要是设置点点的背景颜色的改变
-//        vp_food_group.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
-//
-//            @Override
-//            public void onPageSelected(int position) {
-//                //currentPage = position;
-//                for (int i = 0; i < totalPage; i++) {
-//                    if (i == position) {
-//                        ivPoints[i].setImageResource(R.drawable.meal_food_group_point_focuese);
-//                    } else {
-//                        ivPoints[i].setImageResource(R.drawable.meal_food_group_point_unfocused);
-//                    }
-//                }
-//            }
-//        });
     }
 
     /**

user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java

@@ -284,8 +284,8 @@ public class LoginActivity extends BaseActivity<LoginPresenter> implements Login
                                     }
 
                                     jumpDownloadActivity();
-//                                    killMyself();
-//                                    dialog.dismiss();
+                                    killMyself();
+                                    dialog.dismiss();
                                 }
                             })
                             .build()