1、同步代碼 2、供應鏈相關開發

Signed-off-by: Wyh <1239658231>

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/MultiInputBean.java

@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.bean;
 
 import android.text.InputFilter;
 
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+
 import lombok.Data;
 import me.yokeyword.fragmentation.ISupportFragment;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/MultiSelectBean.java

 package com.gingersoft.gsa.cloud.bean;
 
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+
 import lombok.Data;
 import me.yokeyword.fragmentation.ISupportFragment;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/bean/UploadPicMultiBean.java

 package com.gingersoft.gsa.cloud.bean;
 
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+
 import java.util.List;
 
 import lombok.Data;

base-module/src/main/java/com/gingersoft/gsa/cloud/common/ui/adapter/multi/InfoMultiAdapter.java

@@ -3,9 +3,12 @@ package com.gingersoft.gsa.cloud.common.ui.adapter.multi;
 import android.content.Context;
 
 import com.chad.library.adapter.base.BaseProviderMultiAdapter;
+import com.gingersoft.gsa.cloud.common.R;
 import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
-import com.gingersoft.gsa.cloud.base.R;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.ui.adapter.multi.MultiUploadPicProvider;
+import com.gingersoft.gsa.cloud.ui.adapter.multi.MultipleInputProvider;
+import com.gingersoft.gsa.cloud.ui.adapter.multi.RemarkProvider;
+import com.gingersoft.gsa.cloud.ui.adapter.multi.SelectItemProvider;
 
 import org.jetbrains.annotations.NotNull;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/common/ui/adapter/multi/InputProvider.java

@@ -7,10 +7,10 @@ import android.widget.ImageView;
 
 import com.chad.library.adapter.base.provider.BaseItemProvider;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.R;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputBean;
+import com.gingersoft.gsa.cloud.common.R;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 
 import org.jetbrains.annotations.NotNull;
 

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

@@ -12,7 +12,7 @@ import android.provider.MediaStore;
 import android.text.TextUtils;
 
 import com.elvishew.xlog.XLog;
-import com.gingersoft.gsa.cloud.base.utils.encryption.BASE64Encoder;
+import com.gingersoft.gsa.cloud.common.utils.encryption.BASE64Encoder;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;

base-module/src/main/java/com/gingersoft/gsa/cloud/common/utils/glide/GlideUtils.java

@@ -15,7 +15,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SizeReadyCallback;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
-import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
+import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.http.imageloader.glide.GlideArms;

base-module/src/main/java/com/gingersoft/gsa/cloud/common/utils/inputFilter/InputFilterUtils.java

-package com.gingersoft.gsa.cloud.base.utils.inputFilter;
+package com.gingersoft.gsa.cloud.common.utils.inputFilter;
 
 import android.content.Context;
 import android.text.InputFilter;
 import android.util.Log;
 
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/BaseCategoryAdapter.java

@@ -9,7 +9,7 @@ import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.R;
+import com.gingersoft.gsa.cloud.common.R;
 import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean;
 
 import org.jetbrains.annotations.NotNull;

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/BaseRadioSectionAdapter.java

@@ -11,8 +11,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gingersoft.gsa.cloud.base.R;
-import com.gingersoft.gsa.cloud.base.R2;
+import com.gingersoft.gsa.cloud.common.R;
+import com.gingersoft.gsa.cloud.common.R2;
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionCheckItem;
 import com.qmuiteam.qmui.widget.section.QMUIDefaultStickySectionAdapter;
 import com.qmuiteam.qmui.widget.section.QMUISection;

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/multi/MultiUploadPicProvider.java

@@ -6,10 +6,10 @@ import android.widget.ImageView;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.provider.BaseItemProvider;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.R;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.UploadPicMultiBean;
+import com.gingersoft.gsa.cloud.common.R;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 
 import org.jetbrains.annotations.NotNull;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/multi/MultipleInputProvider.java

@@ -7,10 +7,10 @@ import android.widget.EditText;
 
 import com.chad.library.adapter.base.provider.BaseItemProvider;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.R;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputSelectBean;
+import com.gingersoft.gsa.cloud.common.R;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 
 import org.jetbrains.annotations.NotNull;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/multi/RemarkProvider.java

@@ -6,10 +6,11 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.R;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputBean;
+import com.gingersoft.gsa.cloud.common.R;
+import com.gingersoft.gsa.cloud.common.ui.adapter.multi.InputProvider;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 
 import org.jetbrains.annotations.NotNull;
 

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/multi/SelectItemProvider.java

@@ -5,9 +5,9 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.provider.BaseItemProvider;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.R;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.R;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 
 import org.jetbrains.annotations.NotNull;
 

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

@@ -15,13 +15,22 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.billy.cc.core.component.CC;
-import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.RestaurantInfoUtils;
-import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.base.widget.DialogUtils;
-import com.gingersoft.gsa.cloud.constans.AppConstans;
+import com.gingersoft.gsa.cloud.common.constans.AppConstans;
+import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo;
+import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfo;
+import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager;
+import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils;
+import com.gingersoft.gsa.cloud.common.core.user.UserContext;
+import com.gingersoft.gsa.cloud.common.ui.adapter.BasTextSectiontAdapter;
+import com.gingersoft.gsa.cloud.common.ui.bean.mode.BrandsBean;
+import com.gingersoft.gsa.cloud.common.ui.bean.view.SectionHeader;
+import com.gingersoft.gsa.cloud.common.ui.bean.view.SectionRestaurantItem;
+import com.gingersoft.gsa.cloud.common.ui.widget.dialog.DialogUtils;
+import com.gingersoft.gsa.cloud.common.ui.widget.dialog.LoadingDialog;
+import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
+import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.component.ComponentName;
 import com.gingersoft.gsa.cloud.login.R;
 import com.gingersoft.gsa.cloud.login.R2;
 import com.gingersoft.gsa.cloud.login.mvp.bean.LoginLimitBean;
@@ -30,11 +39,6 @@ import com.gingersoft.gsa.cloud.login.mvp.ui.activity.di.module.ChooseRestaurant
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.contract.ChooseRestaurantContract;
 import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.presenter.ChooseRestaurantPresenter;
 import com.gingersoft.gsa.cloud.login.mvp.ui.adapter.LoginLimitAdapter;
-import com.gingersoft.gsa.cloud.ui.adapter.BasTextSectiontAdapter;
-import com.gingersoft.gsa.cloud.ui.bean.mode.BrandsBean;
-import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;
-import com.gingersoft.gsa.cloud.ui.bean.view.SectionRestaurantItem;
-import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
 import com.jess.arms.base.BaseActivity;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.integration.AppManager;
@@ -114,7 +118,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
     @Override
     public void initTopBar() {
         mTopBar.setBackgroundColor(ContextCompat.getColor(mContext,
-                com.gingersoft.gsa.cloud.base.R.color.theme_color));
+                R.color.theme_color));
         mTopBar.addLeftBackImageButton().setOnClickListener(v -> {
             if (TextUtil.isNotEmptyOrNullOrUndefined(form) && form.equals(WelcomeActivity.class.getName())) {
                 launchActivity(new Intent(mContext, LoginActivity.class));
@@ -168,20 +172,17 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
     public void saveRestaurantListInfo(List<BrandsBean.BrandsData> brands) {
         List<BrandsBean.BrandsData> brandsBeans = new ArrayList<>();
         if (brands != null) {
-            String brandRestaurantInfos = JsonUtils.toJson(brands);
-            GsaCloudApplication.setBrandRestaurantInfos(mContext, brandRestaurantInfos);
+            ResturantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands));
             brandsBeans.addAll(brands);
         }
         showChooseRestaurantDialog(brandsBeans, brands);
     }
 
     protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) {
-        GsaCloudApplication.setBrandId(mContext, brandId);
-        GsaCloudApplication.setBrandName(mContext, brandName);
+        ResturantInfoManager.newInstance().setBrandInfo(new BrandInfo(brandId, brandName));
         if (restaurantsBean != null) {
-            GsaCloudApplication.setRestaurantId(mContext, restaurantsBean.getRestaurantId());
-            GsaCloudApplication.setRestaurantName(mContext, restaurantsBean.getRestaurantName());
-            GsaCloudApplication.setGsPosShopId(mContext, restaurantsBean.getGsPosShopId());
+            ResturantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
+                    ,restaurantsBean.getGsPosShopId()));
         }
     }
 
@@ -229,7 +230,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
         //切換餐廳，發送關閉接單的廣播，並清除心跳
         sendBroadcast(new Intent(AppConstans.CLEAR_ORDER_RECEIVING_HEART));
         //关闭Prj打印服務
-        CC.obtainBuilder("Component.Print")
+        CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
                 .setActionName("stopPrintService")
                 .build()
                 .call();
@@ -249,7 +250,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
     @Override
     public void jumpDownloadActivity() {
         killBeforeActivity();
-        CC.obtainBuilder("Component.Download")
+        CC.obtainBuilder(ComponentName.COMPONENT_DOWNLOAD)
                 .setActionName("showDownloadActivity")
                 .addParam("fromPage", 1)
                 .build()
@@ -277,7 +278,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
 
     @Override
     public void jumpMainActivity() {
-        CC.obtainBuilder("Component.Main")
+        CC.obtainBuilder(ComponentName.COMPONENT_MAIN)
                 .setActionName("showMainActivity")
                 .build()
                 .call();
@@ -291,6 +292,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
     private DialogUtils dialogUtils;
     private int loginNum = 0;
 
+    @Override
     public void showLoginLimit(List<LoginLimitBean> loginLimitBeans) {
         if (loginLimitBeans != null) {
             dialogUtils = new DialogUtils(mContext, R.layout.login_limit_dialog_layout) {

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/FunctionAdapter.java

@@ -9,7 +9,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gingersoft.gsa.cloud.common.utils.glide.GlideUtils;
 import com.gingersoft.gsa.cloud.database.bean.Function;
 import com.gingersoft.gsa.cloud.main.R;
 
@@ -65,7 +64,7 @@ public class FunctionAdapter extends BaseAdapter {
             viewholder = (ViewHolder) convertView.getTag();
         }
 
-        GlideUtils.display(mContext, viewholder.iv_image, dataBean.getImageURL(), R.drawable.ic_selected_main, R.drawable.ic_selected_main, R.drawable.ic_selected_main);
+        com.gingersoft.gsa.cloud.base.utils.glide.GlideUtils.display(mContext, viewholder.iv_image, dataBean.getImageURL(), R.drawable.ic_selected_main, R.drawable.ic_selected_main, R.drawable.ic_selected_main);
         viewholder.tv_title.setText(dataBean.getResName());
 
         viewholder.ll_container.setOnClickListener(new View.OnClickListener() {

print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java

@@ -17,7 +17,6 @@ import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
 import com.gingersoft.gsa.cloud.common.core.print.bean.PrjBean;
 import com.joe.print.mvp.model.bean.HtmlLable;
 import com.joe.print.mvp.print.common.HtmlContract;
-import com.gingersoft.gsa.cloud.print.bean.PrjBean;
 import com.joe.print.R;
 import com.joe.print.mvp.ui.adapter.KitChenPrjPrintFoodAdapter;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/contract/CategoryContract.java

 package com.gingersoft.supply_chain.mvp.contract;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
 import com.jess.arms.mvp.IModel;
 import com.jess.arms.mvp.IView;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/contract/FoodIngredientsContract.java

 package com.gingersoft.supply_chain.mvp.contract;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean;
 import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
 import com.jess.arms.mvp.IModel;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/contract/NewFoodIngredientsContract.java

 package com.gingersoft.supply_chain.mvp.contract;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.jess.arms.mvp.IModel;
 import com.jess.arms.mvp.IView;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/contract/NewSupplierContract.java

 package com.gingersoft.supply_chain.mvp.contract;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.jess.arms.mvp.IModel;
 import com.jess.arms.mvp.IView;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/model/CategoryModel.java

@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
 import com.gingersoft.supply_chain.mvp.contract.CategoryContract;
 import com.gingersoft.supply_chain.mvp.server.SupplierServer;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/model/FoodIngredientsModel.java

@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
 import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract;
 import com.gingersoft.supply_chain.mvp.server.SupplierServer;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/model/NewFoodIngredientsModel.java

@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.model;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract;
 import com.gingersoft.supply_chain.mvp.server.SupplierServer;
 import com.google.gson.Gson;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/CategoryPresenter.java

@@ -3,9 +3,10 @@ package com.gingersoft.supply_chain.mvp.presenter;
 import android.app.Application;
 
 import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager;
+import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
 import com.gingersoft.supply_chain.mvp.contract.CategoryContract;
 import com.jess.arms.di.scope.FragmentScope;
@@ -80,8 +81,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
         map.put("pageSize", 1000);
         map.put("pageIndex", 0);
         map.put("parentId", parentId);
-        map.put("restaurantId", GsaCloudApplication.getRestaurantId());
-        map.put("brandId", GsaCloudApplication.getBrandId());
+        map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
+        map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
         if (!TextUtil.isEmptyOrNullOrUndefined(name)) {
             map.put("name", name);
         }
@@ -164,8 +165,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
 
     public void addCategory(int parentId, String categoryName, int hierarchy) {
         FoodCategoryResultBean.DataBean.FoodCategoryBean foodCategoryBean = new FoodCategoryResultBean.DataBean.FoodCategoryBean();
-        foodCategoryBean.setBrandId(GsaCloudApplication.getBrandId());
-        foodCategoryBean.setRestaurantId(GsaCloudApplication.getRestaurantId());
+        foodCategoryBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
+        foodCategoryBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
         foodCategoryBean.setName(categoryName);
         foodCategoryBean.setParentId(parentId);
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/CategorySelectPresenter.java

@@ -2,8 +2,8 @@ package com.gingersoft.supply_chain.mvp.presenter;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionCheckItem;
 import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
 import com.gingersoft.supply_chain.mvp.contract.CategorySelectContract;
@@ -75,8 +75,8 @@ public class CategorySelectPresenter extends BasePresenter<CategorySelectContrac
         map.put("pageSize", 1000);
         map.put("pageIndex", 0);
         map.put("parentId", parentId);
-        map.put("restaurantId", GsaCloudApplication.getRestaurantId());
-        map.put("brandId", GsaCloudApplication.getBrandId());
+        map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
+        map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
         if (!TextUtil.isEmptyOrNullOrUndefined(name)) {
             map.put("name", name);
         }

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/FoodIngredientsPresenter.java

@@ -2,9 +2,9 @@ package com.gingersoft.supply_chain.mvp.presenter;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager;
+import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
 import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean;
 import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
 import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract;
@@ -75,8 +75,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
         Map<String, Object> map = new HashMap<>(5);
         map.put("pageSize", 1000);
         map.put("pageIndex", 0);
-        map.put("restaurantId", GsaCloudApplication.getRestaurantId());
-        map.put("brandId", GsaCloudApplication.getBrandId());
+        map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
+        map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
         if (supplierId != -1) {
             map.put("supplierId", supplierId);
         }
@@ -117,8 +117,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
         Map<String, Object> map = new HashMap<>(5);
         map.put("pageSize", 1000);
         map.put("pageIndex", 0);
-        map.put("restaurantId", GsaCloudApplication.getRestaurantId());
-        map.put("brandId", GsaCloudApplication.getBrandId());
+        map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
+        map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
         if (supplierId != -1) {
             map.put("supplierId", supplierId);
         }

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewFoodIngredientsPresenter.java

@@ -2,15 +2,15 @@ package com.gingersoft.supply_chain.mvp.presenter;
 
 import android.app.Application;
 
-import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputBean;
 import com.gingersoft.gsa.cloud.bean.MultiSelectBean;
 import com.gingersoft.gsa.cloud.bean.UploadPicMultiBean;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
+import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionCheckItem;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.mvp.bean.FoodInfoBean;
@@ -238,8 +238,8 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
 
     public FoodInfoBean getFoodInfoByInfoMulti(List<InfoMultiBean> infoMultiBeans) {
         FoodInfoBean foodInfoBean = new FoodInfoBean();
-        foodInfoBean.setBrandId(GsaCloudApplication.getBrandId());
-        foodInfoBean.setRestaurantId(GsaCloudApplication.getRestaurantId());
+        foodInfoBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
+        foodInfoBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
         foodInfoBean.setFoodNo(infoMultiBeans.get(foodNoIndex).getShowValue());
         foodInfoBean.setName(infoMultiBeans.get(foodNameIndex).getShowValue());
         if (TextUtil.isNotEmptyOrNullOrUndefined(picUrl)) {

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewSupplierPresenter.java

@@ -5,16 +5,16 @@ import android.content.Context;
 import android.text.InputFilter;
 import android.view.inputmethod.EditorInfo;
 
-import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
-import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.inputFilter.InputFilterUtils;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputBean;
-import com.gingersoft.gsa.cloud.constans.AppConstans;
-import com.gingersoft.gsa.cloud.ui.adapter.multi.InfoMultiAdapter;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.constans.AppConstans;
+import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager;
+import com.gingersoft.gsa.cloud.common.ui.adapter.multi.InfoMultiAdapter;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
+import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
+import com.gingersoft.gsa.cloud.common.utils.inputFilter.InputFilterUtils;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.ui.adapter.multi.RemarkProvider;
 import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
 import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract;
@@ -288,8 +288,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
         String telephone = infoMultiBeans.get(telephoneIndex).getShowValue();
         supplierInfoBean.setContactInformation(telephone);
         supplierInfoBean.setAddress(infoMultiBeans.get(addressIndex).getShowValue());
-        supplierInfoBean.setRestaurantId(GsaCloudApplication.getRestaurantId());
-        supplierInfoBean.setBrandId(GsaCloudApplication.getBrandId());
+        supplierInfoBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
+        supplierInfoBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
         if (TextUtil.isEmptyOrNullOrUndefined(supplierInfoBean.getSupplierNo())) {
             supplierInfoBean.setSupplierNo("GYS001");
         }

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/PackageSpecificationPresenter.java

@@ -4,8 +4,8 @@ import android.app.Application;
 import android.text.InputFilter;
 import android.view.inputmethod.EditorInfo;
 
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputSelectBean;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
 import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean;
 import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean;
 import com.gingersoft.supply_chain.mvp.contract.PackageSpecificationContract;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/server/SupplierServer.java

 package com.gingersoft.supply_chain.mvp.server;
 
-import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
+import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
 import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
 import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/FoodListAdapter.java

@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.gingersoft.gsa.cloud.base.utils.glide.GlideUtils;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/PurchaseOrderAdapter.java

@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.ui.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
+import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderBean;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/SecondCategoryAdapter.java

@@ -5,7 +5,7 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/CategoryFragment.java

@@ -16,8 +16,8 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
-import com.gingersoft.gsa.cloud.base.widget.DialogUtils;
+import com.gingersoft.gsa.cloud.common.ui.widget.dialog.DialogUtils;
+import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
 import com.gingersoft.gsa.cloud.ui.adapter.BaseCategoryAdapter;
 import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean;
 import com.gingersoft.supply_chain.R;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/CategorySelectFragment.java

@@ -10,7 +10,7 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.ui.adapter.BaseRadioSectionAdapter;
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionCheckItem;
 import com.gingersoft.supply_chain.R;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewFoodIngredientsFragment.java

@@ -16,15 +16,15 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemChildClickListener;
-import com.gingersoft.gsa.cloud.base.utils.FileUtils;
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiSelectBean;
 import com.gingersoft.gsa.cloud.bean.UploadPicMultiBean;
-import com.gingersoft.gsa.cloud.ui.adapter.multi.InfoMultiAdapter;
+import com.gingersoft.gsa.cloud.common.ui.adapter.multi.InfoMultiAdapter;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration;
+import com.gingersoft.gsa.cloud.common.utils.FileUtils;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
 import com.gingersoft.gsa.cloud.ui.bean.view.SectionCheckItem;
-import com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.R2;
 import com.gingersoft.supply_chain.di.component.DaggerNewFoodIngredientsComponent;
@@ -42,8 +42,8 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.OnClick;
 
+import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
 import static com.gingersoft.gsa.cloud.ui.adapter.multi.MultiUploadPicProvider.CHOOSE_PHOTO;
-import static com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
 import static com.gingersoft.supply_chain.mvp.ui.fragment.CategorySelectFragment.SELECT_CATEGORY_DATA_KEY;
 import static com.gingersoft.supply_chain.mvp.ui.fragment.CategorySelectFragment.SELECT_FOOD_CATEGORY_REQUEST_CODE;
 import static com.gingersoft.supply_chain.mvp.ui.fragment.PackageSpecificationFragment.FOOD_PACKING_SPECIFICATION_DATA_KEY;

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewFoodUnitFragment.java

@@ -9,10 +9,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputBean;
-import com.gingersoft.gsa.cloud.ui.adapter.multi.InfoMultiAdapter;
-import com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration;
+import com.gingersoft.gsa.cloud.common.ui.adapter.multi.InfoMultiAdapter;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.R2;
 import com.gingersoft.supply_chain.di.component.DaggerNewFoodUnitComponent;
@@ -29,7 +29,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.OnClick;
 
-import static com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
+import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
 import static com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment.EDIT_FOOD_UNIT_REQUEST_CODE;
 
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewSupplierFragment.java

@@ -9,8 +9,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration;
-import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
+import com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration;
+import com.gingersoft.gsa.cloud.common.ui.utils.AppDialog;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.R2;
 import com.gingersoft.supply_chain.di.component.DaggerNewSupplierComponent;
@@ -24,7 +24,7 @@ import com.qmuiteam.qmui.widget.QMUITopBar;
 import butterknife.BindView;
 import butterknife.OnClick;
 
-import static com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
+import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
 import static com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean.DELETE;
 import static com.gingersoft.supply_chain.mvp.ui.fragment.SupplierListFragment.SUPPLIER_LIST;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/PackageSpecificationFragment.java

@@ -9,12 +9,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
-import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
-import com.gingersoft.gsa.cloud.bean.InfoMultiBean;
 import com.gingersoft.gsa.cloud.bean.MultiInputSelectBean;
-import com.gingersoft.gsa.cloud.ui.adapter.multi.InfoMultiAdapter;
-import com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration;
+import com.gingersoft.gsa.cloud.common.ui.adapter.multi.InfoMultiAdapter;
+import com.gingersoft.gsa.cloud.common.ui.bean.InfoMultiBean;
+import com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration;
+import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
+import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.R2;
 import com.gingersoft.supply_chain.di.component.DaggerPackageSpecificationComponent;
@@ -32,7 +32,7 @@ import butterknife.BindView;
 import butterknife.OnClick;
 import me.yokeyword.fragmentation.ISupportFragment;
 
-import static com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
+import static com.gingersoft.gsa.cloud.common.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
 import static com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment.SELECT_FOOD_UNIT_REQUEST_CODE;
 import static com.gingersoft.supply_chain.mvp.ui.fragment.MeasurementUnitFragment.SELECT_FOOD_UNIT_RESULT_DATA;
 

supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/widget/ScreenView.java

@@ -10,7 +10,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
+import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
 import com.gingersoft.supply_chain.R;
 import com.gingersoft.supply_chain.R2;