1、已下單食品點擊一個全部選中問題

cfa82849 · 宁斌 · e4ae7b9b · cfa82849 · cfa82849 · cfa82849
Commit cfa82849 authored Mar 03, 2020 by 宁斌
14 changed files
--- a/download-data/src/main/java/com/gingersoft/gsa/cloud/download/mvp/model/DownloadModel.java
+++ b/download-data/src/main/java/com/gingersoft/gsa/cloud/download/mvp/model/DownloadModel.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;
+import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
 import com.gingersoft.gsa.cloud.download.mvp.model.bean.ComboItemRespone;
@@ -22,6 +23,7 @@ import com.gingersoft.gsa.cloud.download.mvp.contract.DownloadContract;
 import java.util.List;
 import io.reactivex.Observable;
+import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 /**
@@ -46,6 +48,7 @@ public class DownloadModel extends BaseModel implements DownloadContract.Model {
    @Inject
    public DownloadModel(IRepositoryManager repositoryManager) {
        super(repositoryManager);
+        RetrofitUrlManager.getInstance().putDomain("common", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL);
    }
    @Override

--- a/main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/MainTopPresenter.java
+++ b/main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/MainTopPresenter.java
@@ -91,13 +91,13 @@ public class MainTopPresenter extends BasePresenter<MainTopContract.Model, MainT
                    @Override
                    public void onComplete() {
                        super.onComplete();
-                        RetrofitUrlManager.getInstance().putDomain("common", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL);
+//                        RetrofitUrlManager.getInstance().putDomain("common", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL);
                    }
                    @Override
                    public void onError(Throwable t) {
                        super.onError(t);
-                        RetrofitUrlManager.getInstance().putDomain("common", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL);
+//                        RetrofitUrlManager.getInstance().putDomain("common", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL);
                    }
                });
    }

--- a/public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
+++ b/public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
@@ -543,8 +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.setParentId(foods.getParentId());
        orderDetail.setUnit_price(foods.getPrice());
        orderDetail.setPrice(number * orderDetail.getUnit_price());
        orderDetail.setNumber(number);

--- a/public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/constans/HttpsConstans.java
+++ b/public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/constans/HttpsConstans.java
@@ -4,8 +4,8 @@ package com.gingersoft.gsa.cloud.base.utils.constans;
 * Created by Wyh on 2019/12/21.
 */
 public class HttpsConstans {
-    //默認為深圳
+    //默認為香港
-    public static String ROOT_SERVER_ADDRESS_FORMAL = "http://gingersoft.tpddns.cn:58201/ricepon-cloud-gsa/api/";
+    public static String ROOT_SERVER_ADDRESS_FORMAL = "http://a.ricepon.com:58201/ricepon-cloud-gsa/api/";
    public static final String ROOT_SERVER_ADDRESS_FORMAL_SZ = "http://gingersoft.tpddns.cn:58201/ricepon-cloud-gsa/api/";// 深圳服务器
    public static final String ROOT_SERVER_ADDRESS_FORMAL_HK = "http://a.ricepon.com:58201/ricepon-cloud-gsa/api/";// 香港服务器

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
+import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.database.bean.ComboItem;
 import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
 import com.gingersoft.gsa.cloud.database.bean.FoodModifier;
@@ -29,6 +30,7 @@ import javax.inject.Inject;
 import io.reactivex.Observable;
 import io.reactivex.functions.Function;
+import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 import okhttp3.RequestBody;

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
 import android.app.Application;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
 import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.OrderRequest;
@@ -16,6 +17,7 @@ import com.jess.arms.mvp.BaseModel;
 import javax.inject.Inject;
 import io.reactivex.Observable;
+import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 import okhttp3.RequestBody;

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java
@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
 import android.app.Application;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
 import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
 import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
@@ -14,6 +15,7 @@ import com.jess.arms.mvp.BaseModel;
 import javax.inject.Inject;
 import io.reactivex.Observable;
+import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 import okhttp3.RequestBody;

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
 import android.app.Application;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
 import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
@@ -18,6 +19,7 @@ import javax.inject.Inject;
 import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
 import io.reactivex.Observable;
+import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 import okhttp3.RequestBody;

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
@@ -164,12 +164,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
            @Override
            public void onMealCountDelete(OrderDetail datasBean, int position) {
            }
            @Override
            public void onMealCountAdd(OrderDetail datasBean, int position) {
            }
        });
        mFoodAdapter.setOnItemClickListener(new FoodAdapter.OnItemClickListener() {
@@ -200,17 +198,12 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
 //                    return;
 //                }
-//                if (datasBean.isModKeyboard()) {
-//                    addModalKeyBoardModfier(datasBean.getModifier());
-//                    displayModalKeyBoardDialog();
-//                } else {
                //设置当前操作的套餐细项
                mCurrentOrderDetailBean = OrderDetail.comboTransOrderDetail(datasBean, 1, mCurrentOrderDetailBean.getId(), "combo", RvMealClicked);
                //先清除上一次选择的子项最大数
 //                        mModel.clearComboQty();
                //添加子项
                addComboItem(mCurrentOrderDetailBean);
-//                }
            }
        });
        mModifierAdapter.setOnItemClickListener(new ModifierAdapter.OnItemClickListener() {
@@ -324,7 +317,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
        if (comboItemList.size() > 0) {
            IActivity.setModifierTop(10);
-        }else {
+        } else {
            IActivity.setModifierTop(0);
        }
@@ -722,7 +715,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
        return true;
    }
    public void updateOrderFoodNumber() {
        setFoodBtnNumber();
        setFoodGroupBtnNumber(IActivity.getFoodGroupGridViewAdapter(), mFoodGroupList);
@@ -746,13 +738,14 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
    }
    private void setFoodGroupBtnNumber(FoodGroupAdapter adapter, List<Food> foodGroupList) {
+        List<OrderDetail> orderDetailList = getOrderFoodLists();
        for (int i = 0; i < foodGroupList.size(); i++) {
            Food foodBean = foodGroupList.get(i);
            foodBean.setNumber(0);
            int iNumber = 0;
-            if (getOrderFoodLists() != null) {
+            if (orderDetailList != null) {
-                for (int j = 0; j < getOrderFoodLists().size(); j++) {
+                for (int j = 0; j < orderDetailList.size(); j++) {
-                    OrderDetail food = getOrderFoodLists().get(j);
+                    OrderDetail food = orderDetailList.get(j);
                    if (food.isNew() && food.getParentId() == foodBean.getId()) {
                        iNumber = iNumber + food.getNumber();
                        foodBean.setNumber(iNumber);

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
@@ -69,7 +69,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
    private TableActivity IActivity;
-    private List<TableBean.DataBean> mTableList;
+    private List<TableBean.DataBean> mTableList = new ArrayList<>();
    private BottomFunctionAdapter mBottomFunctionAdapter;
    private List<Function> mBottomFunctionList = new ArrayList<>();
@@ -207,18 +207,19 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
                    @Override
                    public void onNext(@NonNull TableBean tableBean) {
                        if (tableBean.isSuccess()) {
-                            mTableList = tableBean.getData();
+                            List<TableBean.DataBean> tableBeanData = tableBean.getData();
-                            mRootView.returnTableList(tableBean.getData());
+                            if (tableBeanData != null) {
+                                if (mTableList.size() > 0) {
+                                    mTableList.clear();
+                                }
+                                mTableList.addAll(tableBeanData);
+                                mRootView.returnTableList(tableBeanData);
+                            }
                        } else {
                            if (show)
                                mRootView.showMessage(tableBean.getErrMsg());
                        }
                    }
-                    @Override
-                    public void onError(Throwable t) {
-                        super.onError(t);
-                    }
                });
    }
@@ -497,13 +498,11 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
    }
    private TableBean.DataBean getTableById(int id) {
-        if (mTableList != null) {
        for (int i = 0; i < mTableList.size(); i++) {
            TableBean.DataBean dataBean = mTableList.get(i);
            if (dataBean.getId() == id)
                return dataBean;
        }
-        }
        return null;
    }

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
@@ -285,10 +285,13 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
                return;
            mPresenter.toFindMeal(inputText);
        });
+        initTableDetail();
+    }
-        TableBean.DataBean tableBean = OpenTableManage.getDefault().getTableBean();
+    private void initTableDetail() {
-        String time = TimeUtils.DEFAULT_DATE_FORMAT.format(tableBean.getCreateTime());
+        if(OpenTableManage.getDefault().getPeopleNumber() == 0){
-        int x = 0;
+            showChoosePeopleNumDialog(false);
+        }
    }
    @Override

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/InputTableFragment.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/InputTableFragment.java
@@ -286,7 +286,11 @@ public class InputTableFragment extends BaseFragment<InputTablePresenter> implem
        TableBean.DataBean table = getTableByName(t_name);
+        if(table != null){
            mActivity.clickTableItem(table);
+        }else {
+            showMessage("未找到該檯號!");
+        }
    }
    private void load_meal_before_splite() {

--- a/user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/model/LoginModel.java
+++ b/user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/model/LoginModel.java
@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.user.login.mvp.model;
 import android.app.Application;
+import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
 import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
 import com.gingersoft.gsa.cloud.user.login.mvp.server.LoginService;
 import com.google.gson.Gson;
@@ -14,6 +15,7 @@ import javax.inject.Inject;
 import com.gingersoft.gsa.cloud.user.login.mvp.contract.LoginContract;
 import io.reactivex.Observable;
+import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
 import okhttp3.RequestBody;

--- a/user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/SwitchServerActivity.java
+++ b/user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/SwitchServerActivity.java
@@ -67,8 +67,8 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
    public void initData(@Nullable Bundle savedInstanceState) {
        String nowServer = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL;
        tvNowServer.setText("當前服務器：" + nowServer);
-        rbSZ.setText("深圳服務器：" + HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ);
        rbHK.setText("香港服務器：" + HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK);
+        rbSZ.setText("深圳服務器：" + HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ);
        if (nowServer.equals(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ)) {
            rbSZ.setChecked(true);
        } else {
@@ -76,9 +76,9 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
        }
        switchServer.setOnClickListener(v -> {
            if (rbSZ.isChecked()) {
-                RetrofitUrlManager.getInstance().putDomain("common", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ);
+                HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ;
            } else {
-                RetrofitUrlManager.getInstance().putDomain("common", HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK);
+                HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK;
            }
            finish();
        });