Skip to content

S
supplier
Commit 71826e2e by Wyh
Options

1、AppConstants改名為AppConstant 2、歷史清機列表

parent 5ba0f646
Showing with 762 additions and 427 deletions
build.gradle
...@@ -39,7 +39,6 @@ buildscript { ...@@ -39,7 +39,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
// maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } //gradle 国内镜像仓
maven { url 'https://maven.aliyun.com/repository/google' } //google 国内镜像仓 maven { url 'https://maven.aliyun.com/repository/google' } //google 国内镜像仓
maven { url 'https://maven.aliyun.com/repository/jcenter' } //jcenter 国内镜像仓 maven { url 'https://maven.aliyun.com/repository/jcenter' } //jcenter 国内镜像仓
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/ColdChainMainActivity.java
...@@ -35,7 +35,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.OrderList; ...@@ -35,7 +35,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.OrderList;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean; import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
import com.gingersoft.coldchain_module.mvp.presenter.ColdChainMainPresenter; import com.gingersoft.coldchain_module.mvp.presenter.ColdChainMainPresenter;
import com.gingersoft.coldchain_module.mvp.ui.fragment.OrderListFragment; import com.gingersoft.coldchain_module.mvp.ui.fragment.OrderListFragment;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.DeliveryPickConstans; import com.gingersoft.gsa.cloud.common.constans.DeliveryPickConstans;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
...@@ -214,7 +214,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre ...@@ -214,7 +214,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
private void initHearBroadcast() { private void initHearBroadcast() {
clearHeartBroadcastReceiver = new ClearHeartBroadcastReceiver(); clearHeartBroadcastReceiver = new ClearHeartBroadcastReceiver();
IntentFilter intentFilter = new IntentFilter(AppConstans.CLEAR_ORDER_RECEIVING_HEART); IntentFilter intentFilter = new IntentFilter(AppConstant.CLEAR_ORDER_RECEIVING_HEART);
registerReceiver(clearHeartBroadcastReceiver, intentFilter); registerReceiver(clearHeartBroadcastReceiver, intentFilter);
} }
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt
...@@ -20,7 +20,6 @@ import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.veri ...@@ -20,7 +20,6 @@ import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.veri
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.common.function.XFunctionManager import com.gingersoft.gsa.cloud.common.function.XFunctionManager
import com.gingersoft.gsa.cloud.common.function.XFunctionViews
import com.gingersoft.gsa.cloud.common.logan.LoganManager import com.gingersoft.gsa.cloud.common.logan.LoganManager
import com.gingersoft.gsa.cloud.common.service.ICommandService import com.gingersoft.gsa.cloud.common.service.ICommandService
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils
...@@ -304,7 +303,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -304,7 +303,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
} }
}, { }, {
it.printStackTrace() it.printStackTrace()
OkHttp3Utils.noticePersonnel(AppConstans.RP_ORDER_LIST_ERROR, "獲取訂單列表報錯" + it.message) OkHttp3Utils.noticePersonnel(AppConstant.RP_ORDER_LIST_ERROR, "獲取訂單列表報錯" + it.message)
OtherOrderUtils.initSoundPool(GsaCloudApplication.getAppContext(), R.raw.raw_get_order_list_error) OtherOrderUtils.initSoundPool(GsaCloudApplication.getAppContext(), R.raw.raw_get_order_list_error)
}) })
} }
...@@ -735,7 +734,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -735,7 +734,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
listener.invoke(getMsgBean(OrderDelivery, "", true)) listener.invoke(getMsgBean(OrderDelivery, "", true))
} }
} else { } else {
OkHttp3Utils.noticePersonnel(AppConstans.RP_UPDATE_ORDER_STATE_ERROR, "修改訂單狀態未成功：$errorMsg") OkHttp3Utils.noticePersonnel(AppConstant.RP_UPDATE_ORDER_STATE_ERROR, "修改訂單狀態未成功：$errorMsg")
listener.invoke(getMsgBean(OrderDelivery, errorMsg, false)) listener.invoke(getMsgBean(OrderDelivery, errorMsg, false))
} }
} else { } else {
...@@ -743,7 +742,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -743,7 +742,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
} }
} }
}, { }, {
OkHttp3Utils.noticePersonnel(AppConstans.RP_UPDATE_ORDER_STATE_ERROR, "訂單狀態" + status + it.message) OkHttp3Utils.noticePersonnel(AppConstant.RP_UPDATE_ORDER_STATE_ERROR, "訂單狀態" + status + it.message)
listener.invoke(getMsgBean(OrderDelivery, "", false)) listener.invoke(getMsgBean(OrderDelivery, "", false))
}) })
} }
...@@ -871,14 +870,14 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -871,14 +870,14 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
} else if (!TextUtil.isEmptyOrNullOrUndefined(errMsg)) { } else if (!TextUtil.isEmptyOrNullOrUndefined(errMsg)) {
listener.invoke(getMsgBean(OrderDelivery, errMsg!!, false)) listener.invoke(getMsgBean(OrderDelivery, errMsg!!, false))
//第三方物流接口異常 //第三方物流接口異常
OkHttp3Utils.noticePersonnel(AppConstans.RP_THIRE_LOGISTICS_ERROR, "第三方物流請求失敗：$errMsg") OkHttp3Utils.noticePersonnel(AppConstant.RP_THIRE_LOGISTICS_ERROR, "第三方物流請求失敗：$errMsg")
} else if (!TextUtil.isEmptyOrNullOrUndefined(message)) { } else if (!TextUtil.isEmptyOrNullOrUndefined(message)) {
listener.invoke(getMsgBean(OrderDelivery, message, false)) listener.invoke(getMsgBean(OrderDelivery, message, false))
//第三方物流接口異常 //第三方物流接口異常
OkHttp3Utils.noticePersonnel(AppConstans.RP_THIRE_LOGISTICS_ERROR, "第三方物流請求失敗：$message") OkHttp3Utils.noticePersonnel(AppConstant.RP_THIRE_LOGISTICS_ERROR, "第三方物流請求失敗：$message")
} else { } else {
listener.invoke(getMsgBean(OrderDelivery, "指派物流失敗", false)) listener.invoke(getMsgBean(OrderDelivery, "指派物流失敗", false))
OkHttp3Utils.noticePersonnel(AppConstans.RP_THIRE_LOGISTICS_ERROR, "第三方物流請求失敗") OkHttp3Utils.noticePersonnel(AppConstant.RP_THIRE_LOGISTICS_ERROR, "第三方物流請求失敗")
} }
} }
}, { it -> }, { it ->
...@@ -893,7 +892,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -893,7 +892,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
} }
} }
} else { } else {
OkHttp3Utils.noticePersonnel(AppConstans.RP_THIRE_LOGISTICS_ERROR, "請求第三方物流接口報錯：" + it.message) OkHttp3Utils.noticePersonnel(AppConstant.RP_THIRE_LOGISTICS_ERROR, "請求第三方物流接口報錯：" + it.message)
listener.invoke(getMsgBean(OrderDelivery, "", false)) listener.invoke(getMsgBean(OrderDelivery, "", false))
} }
}) })
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/PrjQueryActivity.java
...@@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCUtil; import com.billy.cc.core.component.CCUtil;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils; import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils;
...@@ -272,7 +272,7 @@ public class PrjQueryActivity extends BaseActivity<PrjQueryPresenter> implements ...@@ -272,7 +272,7 @@ public class PrjQueryActivity extends BaseActivity<PrjQueryPresenter> implements
ids.append(prjBean.getId()); ids.append(prjBean.getId());
} }
//添加重印的報警推送 //添加重印的報警推送
OkHttp3Utils.noticePersonnel(AppConstans.RP_REPRINT_CODE, "重印，訂單號：" + printDatas.get(0).getOrderNo()); OkHttp3Utils.noticePersonnel(AppConstant.RP_REPRINT_CODE, "重印，訂單號：" + printDatas.get(0).getOrderNo());
String finalIds = ids.toString(); String finalIds = ids.toString();
CC.obtainBuilder(ComponentName.COMPONENT_PRINT) CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_KITCHEN) .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_KITCHEN)
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
package com.gingersoft.gsa.delivery_pick_mode.ui.activity package com.gingersoft.gsa.delivery_pick_mode.ui.activity
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.app.Dialog
import android.content.* import android.content.*
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.net.Uri import android.net.Uri
...@@ -21,7 +20,7 @@ import androidx.lifecycle.Observer ...@@ -21,7 +20,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.common.constans.AppConstans import com.gingersoft.gsa.cloud.common.constans.AppConstant
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant import com.gingersoft.gsa.cloud.common.constans.ExpandConstant
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans.TAKEAWAY_TYPE import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans.TAKEAWAY_TYPE
import com.gingersoft.gsa.cloud.common.constans.Takeaway import com.gingersoft.gsa.cloud.common.constans.Takeaway
...@@ -35,7 +34,6 @@ import com.gingersoft.gsa.cloud.common.utils.other.TextUtil ...@@ -35,7 +34,6 @@ import com.gingersoft.gsa.cloud.common.utils.other.TextUtil
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.order.order.BaseOrder import com.gingersoft.gsa.cloud.order.order.BaseOrder
import com.gingersoft.gsa.cloud.ui.utils.AppDialog import com.gingersoft.gsa.cloud.ui.utils.AppDialog
import com.gingersoft.gsa.cloud.ui.utils.DialogUtils
import com.gingersoft.gsa.delivery_pick_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
import com.gingersoft.gsa.delivery_pick_mode.databinding.ActivityOtherOrderBinding import com.gingersoft.gsa.delivery_pick_mode.databinding.ActivityOtherOrderBinding
import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.PageViewModel import com.gingersoft.gsa.delivery_pick_mode.model.viewModel.PageViewModel
...@@ -175,7 +173,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen ...@@ -175,7 +173,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
* 初始化監聽心跳廣播 * 初始化監聽心跳廣播
*/ */
private fun initBroadcast() { private fun initBroadcast() {
val mFilter = IntentFilter(AppConstans.CLEAR_ORDER_RECEIVING_HEART) val mFilter = IntentFilter(AppConstant.CLEAR_ORDER_RECEIVING_HEART)
mReceiver = ClearHeartBroadcastReceiver() mReceiver = ClearHeartBroadcastReceiver()
registerReceiver(mReceiver, mFilter) registerReceiver(mReceiver, mFilter)
} }
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/ThirdExpensesAdapter.kt
...@@ -15,7 +15,7 @@ class ThirdExpensesAdapter(data: MutableList<ServiceChargeRecordBean.DataX>?) : ...@@ -15,7 +15,7 @@ class ThirdExpensesAdapter(data: MutableList<ServiceChargeRecordBean.DataX>?) :
holder.setText(R.id.tv_third_expenses_amount, "金額") holder.setText(R.id.tv_third_expenses_amount, "金額")
} else { } else {
holder.setText(R.id.tv_third_expenses_user, "" + item.updateName) holder.setText(R.id.tv_third_expenses_user, "" + item.updateName)
holder.setText(R.id.tv_third_expenses_time, TimeUtils.StampToData(TimeUtils.DEFAULT_DATE_FORMAT, item.updateTime)) holder.setText(R.id.tv_third_expenses_time, TimeUtils.stampToData(TimeUtils.DEFAULT_DATE_FORMAT, item.updateTime))
holder.setText(R.id.tv_third_expenses_amount, "+$" + item.paymentValue) holder.setText(R.id.tv_third_expenses_amount, "+$" + item.paymentValue)
} }
} }
......
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java
...@@ -5,7 +5,7 @@ import android.app.Application; ...@@ -5,7 +5,7 @@ import android.app.Application;
import android.content.Intent; import android.content.Intent;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.login.LoginBean; import com.gingersoft.gsa.cloud.common.core.login.LoginBean;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.core.user.state.LoginedState; import com.gingersoft.gsa.cloud.common.core.user.state.LoginedState;
...@@ -106,7 +106,7 @@ public class BaseLoginPresenter<M extends BaseLoginContract.Model, V extends Bas ...@@ -106,7 +106,7 @@ public class BaseLoginPresenter<M extends BaseLoginContract.Model, V extends Bas
public void onError(Throwable t) { public void onError(Throwable t) {
super.onError(t); super.onError(t);
UserContext.newInstance().logOut(); UserContext.newInstance().logOut();
OkHttp3Utils.noticePersonnel(AppConstans.RP_LOGIN_ERROR, "登陸報錯：" + t.getMessage()); OkHttp3Utils.noticePersonnel(AppConstant.RP_LOGIN_ERROR, "登陸報錯：" + t.getMessage());
if (IAcitivity instanceof LoginActivity) { if (IAcitivity instanceof LoginActivity) {
} else { } else {
mRootView.launchActivity(new Intent(IAcitivity, LoginActivity.class)); mRootView.launchActivity(new Intent(IAcitivity, LoginActivity.class));
......
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/ChooseRestaurantActivity.java
...@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCResult; import com.billy.cc.core.component.CCResult;
import com.billy.cc.core.component.CCUtil; import com.billy.cc.core.component.CCUtil;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo; 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.RestaurantInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
...@@ -255,7 +255,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese ...@@ -255,7 +255,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
protected void ChooseRestaurantItemClick(List<BrandsBean.BrandsData> brands, BrandsBean.BrandsData.RestaurantsBean item) { protected void ChooseRestaurantItemClick(List<BrandsBean.BrandsData> brands, BrandsBean.BrandsData.RestaurantsBean item) {
//切換餐廳，發送關閉接單的廣播，並清除心跳 //切換餐廳，發送關閉接單的廣播，並清除心跳
sendBroadcast(new Intent(AppConstans.CLEAR_ORDER_RECEIVING_HEART)); sendBroadcast(new Intent(AppConstant.CLEAR_ORDER_RECEIVING_HEART));
//关闭Prj打印服務 //关闭Prj打印服務
CC.obtainBuilder(ComponentName.COMPONENT_PRINT) CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
.setActionName("stopPrintService") .setActionName("stopPrintService")
......
component-main/src/main/AndroidManifest.xml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:name=".mvp.ui.activity.NewMainActivity" android:name=".mvp.ui.activity.NewMainActivity"
android:alwaysRetainTaskState="true" android:alwaysRetainTaskState="true"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait"/> android:screenOrientation="portrait" />
<activity <activity
android:name=".mvp.ui.activity.ExpandListActivity" android:name=".mvp.ui.activity.ExpandListActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
<activity <activity
android:name=".mvp.ui.activity.menu.FoodMenuManageActivity" android:name=".mvp.ui.activity.menu.FoodMenuManageActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.LiquidationHistoryActivity"
android:screenOrientation="portrait" />
<!-- arms配置 --> <!-- arms配置 -->
<meta-data <meta-data
android:name="com.gingersoft.gsa.cloud.common.config.globalconfig.GlobalConfiguration" android:name="com.gingersoft.gsa.cloud.common.config.globalconfig.GlobalConfiguration"
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/contract/LiquidationHistoryContract.java
package com.gingersoft.gsa.cloud.main.mvp.contract; package com.gingersoft.gsa.cloud.main.mvp.contract;
import com.jess.arms.mvp.IView; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.LiquidationHistoryAdapter;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
import com.jess.arms.mvp.IView;
import java.util.Map;
import io.reactivex.Observable;
/** /**
...@@ -19,11 +26,21 @@ import com.jess.arms.mvp.IModel; ...@@ -19,11 +26,21 @@ import com.jess.arms.mvp.IModel;
public interface LiquidationHistoryContract { public interface LiquidationHistoryContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息 //对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView { interface View extends IView {
void setAdapter(LiquidationHistoryAdapter liquidationHistoryAdapter);
void setLoadNoMoreData();
void setNoData();
void finisLoad();
void toSettlementReportActivity(SettlementReport mSettlementReportBean);
} }
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存 //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel { interface Model extends IModel {
Observable<BaseResult> getLiquidationHistory(Map<String, Object> map);
Observable<BaseResult> getSettlementReport(int restaurantId, String startTime, String endTime);
} }
} }
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/LiquidationHistoryModel.java
...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.main.mvp.model; ...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.main.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.main.mvp.model.service.SettlementService;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jess.arms.integration.IRepositoryManager; import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel; import com.jess.arms.mvp.BaseModel;
...@@ -12,6 +14,10 @@ import javax.inject.Inject; ...@@ -12,6 +14,10 @@ import javax.inject.Inject;
import com.gingersoft.gsa.cloud.main.mvp.contract.LiquidationHistoryContract; import com.gingersoft.gsa.cloud.main.mvp.contract.LiquidationHistoryContract;
import java.util.Map;
import io.reactivex.Observable;
/** /**
* ================================================ * ================================================
...@@ -43,4 +49,14 @@ public class LiquidationHistoryModel extends BaseModel implements LiquidationHis ...@@ -43,4 +49,14 @@ public class LiquidationHistoryModel extends BaseModel implements LiquidationHis
this.mGson = null; this.mGson = null;
this.mApplication = null; this.mApplication = null;
} }
@Override
public Observable<BaseResult> getLiquidationHistory(Map<String, Object> map) {
return mRepositoryManager.obtainRetrofitService(SettlementService.class).getLiquidationHistory(map);
}
@Override
public Observable<BaseResult> getSettlementReport(int restaurantId, String startTime, String endTime) {
return mRepositoryManager.obtainRetrofitService(SettlementService.class).getSettlementReport(restaurantId, startTime, endTime);
}
} }
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/MainConstant.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.model;
/**
* @author 宇航. 1239658231@qq.com
* Date: 2021/5/28
* Time: 14:28
* Use:
*/
public class MainConstant {
}
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/SettlementModel.java
...@@ -50,6 +50,6 @@ public class SettlementModel extends BaseModel implements SettlementContract.Mod ...@@ -50,6 +50,6 @@ public class SettlementModel extends BaseModel implements SettlementContract.Mod
@Override @Override
public Observable<BaseResult> getSettlementReport(int restaurantId) { public Observable<BaseResult> getSettlementReport(int restaurantId) {
return mRepositoryManager.obtainRetrofitService(SettlementService.class) return mRepositoryManager.obtainRetrofitService(SettlementService.class)
.getSettlementReport(restaurantId); .getSettlementReport(restaurantId, "", "");
} }
} }
\ No newline at end of file
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/SettlementReportModel.java
...@@ -59,7 +59,7 @@ public class SettlementReportModel extends BaseModel implements SettlementReport ...@@ -59,7 +59,7 @@ public class SettlementReportModel extends BaseModel implements SettlementReport
@Override @Override
public Observable<BaseResult> getSettlementReport(int restaurantId) { public Observable<BaseResult> getSettlementReport(int restaurantId) {
return mRepositoryManager.obtainRetrofitService(SettlementService.class) return mRepositoryManager.obtainRetrofitService(SettlementService.class)
.getSettlementReport(restaurantId); .getSettlementReport(restaurantId, "", "");
} }
@Override @Override
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/LiquidationBean.java deleted 100644 → 0
package com.gingersoft.gsa.cloud.main.mvp.model.bean;
import lombok.Data;
/**
* @author 宇航. 1239658231@qq.com
* User: 宇航. 1239658231@qq.com
* Date: 2021/5/26
* Time: 18:23
* Use:
*/
@Data
public class LiquidationBean {
private long createTime;
private String no;
private int id;
}
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/SettlementHistoryListBean.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.model.bean;
/**
* @author 宇航. 1239658231@qq.com
* Date: 2021/5/28
* Time: 15:47
* Use:清機歷史列表
*/
public class SettlementHistoryListBean {
/**
* id : 366
* restaurantId : 312
* type : 3
* operationTime : 1621928421000
* operationStartTime : 1621928084000
*/
private int id;
private int restaurantId;
private int type;
private long operationTime;
private long operationStartTime;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public long getOperationTime() {
return operationTime;
}
public void setOperationTime(long operationTime) {
this.operationTime = operationTime;
}
public long getOperationStartTime() {
return operationStartTime;
}
public void setOperationStartTime(long operationStartTime) {
this.operationStartTime = operationStartTime;
}
}
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/service/SettlementService.java
...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.main.mvp.model.service; ...@@ -3,6 +3,8 @@ package com.gingersoft.gsa.cloud.main.mvp.model.service;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SendSettlement; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SendSettlement;
import java.util.Map;
import io.reactivex.Observable; import io.reactivex.Observable;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager; import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody; import okhttp3.RequestBody;
...@@ -11,6 +13,7 @@ import retrofit2.http.GET; ...@@ -11,6 +13,7 @@ import retrofit2.http.GET;
import retrofit2.http.Headers; import retrofit2.http.Headers;
import retrofit2.http.POST; import retrofit2.http.POST;
import retrofit2.http.Query; import retrofit2.http.Query;
import retrofit2.http.QueryMap;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
...@@ -26,7 +29,7 @@ public interface SettlementService { ...@@ -26,7 +29,7 @@ public interface SettlementService {
@Headers({"Domain-Name: settlement_report_server"}) @Headers({"Domain-Name: settlement_report_server"})
@GET("restaurantOperation/report" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @GET("restaurantOperation/report" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> getSettlementReport(@Query("restaurantId") int restaurantId); Observable<BaseResult> getSettlementReport(@Query("restaurantId") int restaurantId, @Query("startTime") String startTime, @Query("endTime") String endTIme);
@POST("posPay/addOperation" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("posPay/addOperation" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> addHywebPosSettlementOperation(); Observable<BaseResult> addHywebPosSettlementOperation();
...@@ -34,4 +37,8 @@ public interface SettlementService { ...@@ -34,4 +37,8 @@ public interface SettlementService {
@POST("posPay/updateOperation" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("posPay/updateOperation" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> updateHywebPosSettlementOperation(@Body RequestBody requestBody); Observable<BaseResult> updateHywebPosSettlementOperation(@Body RequestBody requestBody);
@Headers({"Domain-Name: settlement_report_server"})
@GET("restaurantOperation/getHistoryCleaner" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> getLiquidationHistory(@QueryMap Map<String, Object> map);
} }
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/LiquidationHistoryPresenter.java
...@@ -2,16 +2,33 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,16 +2,33 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.jess.arms.integration.AppManager; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
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.main.mvp.contract.LiquidationHistoryContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementHistoryListBean;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementActivity;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.LiquidationHistoryAdapter;
import com.gingersoft.gsa.cloud.ui.animator.CustomAnimation3;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
import com.jess.arms.mvp.BasePresenter;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
import com.gingersoft.gsa.cloud.main.mvp.contract.LiquidationHistoryContract; import io.reactivex.annotations.NonNull;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
/** /**
...@@ -29,11 +46,19 @@ public class LiquidationHistoryPresenter extends BasePresenter<LiquidationHistor ...@@ -29,11 +46,19 @@ public class LiquidationHistoryPresenter extends BasePresenter<LiquidationHistor
@Inject @Inject
AppManager mAppManager; AppManager mAppManager;
private LiquidationHistoryAdapter liquidationHistoryAdapter;
@Inject @Inject
public LiquidationHistoryPresenter(LiquidationHistoryContract.Model model, LiquidationHistoryContract.View rootView) { public LiquidationHistoryPresenter(LiquidationHistoryContract.Model model, LiquidationHistoryContract.View rootView) {
super(model, rootView); super(model, rootView);
} }
public void initAdapter() {
liquidationHistoryAdapter = new LiquidationHistoryAdapter(null);
liquidationHistoryAdapter.setAdapterAnimation(new CustomAnimation3());
mRootView.setAdapter(liquidationHistoryAdapter);
}
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
...@@ -42,4 +67,62 @@ public class LiquidationHistoryPresenter extends BasePresenter<LiquidationHistor ...@@ -42,4 +67,62 @@ public class LiquidationHistoryPresenter extends BasePresenter<LiquidationHistor
this.mImageLoader = null; this.mImageLoader = null;
this.mApplication = null; this.mApplication = null;
} }
public void getLiquidationHistory(int pageIndex, String startTime, String endTime) {
Map<String, Object> map = new HashMap<>(6);
AppConstant.addRestaurantId(map);
map.put("restaurantId", "312");
map.put("startTime", startTime);
map.put("endTime", endTime);
map.put("type", SettlementActivity.SETTLEMENT_TYPE_NOMAL);
AppConstant.addPageIndex(map, pageIndex);
AppConstant.addPageSize(map);
sendRequest(mModel.getLiquidationHistory(map), AppConstant.GET_INFO_LOADING)
.subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
@Override
public void onNext(BaseResult baseResult) {
if (baseResult.isSuccess()) {
List<SettlementHistoryListBean> historyListBeans = GsonUtils.jsonToList(baseResult.getData(), SettlementHistoryListBean.class);
if (CollectionUtils.isNotNullOrEmpty(historyListBeans)) {
if (pageIndex == 0) {
liquidationHistoryAdapter.setList(historyListBeans);
} else {
liquidationHistoryAdapter.addData(historyListBeans);
}
mRootView.finisLoad();
} else if (pageIndex > 0 && liquidationHistoryAdapter.getItemCount() > 0) {
mRootView.setLoadNoMoreData();
} else {
mRootView.setNoData();
}
} else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg());
} else {
mRootView.showMessage(AppConstant.GET_INFO_ERROR);
}
}
});
}
public void getSettlementReport(String startTime, String endTime) {
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
sendRequest(mModel.getSettlementReport(restaurantId, startTime, endTime), AppConstant.GET_INFO_LOADING)
.subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
@Override
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
SettlementReport settlementReport = JsonUtils.parseObject(info.getData(), SettlementReport.class);
if (settlementReport != null) {
mRootView.toSettlementReportActivity(settlementReport);
return;
}
}
}
mRootView.showMessage(AppConstant.GET_INFO_ERROR);
}
});
}
} }
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LiquidationHistoryActivity.java
...@@ -2,30 +2,37 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.activity; ...@@ -2,30 +2,37 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.common.loadsir.EmptyCallback;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.di.component.DaggerLiquidationHistoryComponent; import com.gingersoft.gsa.cloud.main.di.component.DaggerLiquidationHistoryComponent;
import com.gingersoft.gsa.cloud.main.mvp.contract.LiquidationHistoryContract; import com.gingersoft.gsa.cloud.main.mvp.contract.LiquidationHistoryContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementHistoryListBean;
import com.gingersoft.gsa.cloud.main.mvp.presenter.LiquidationHistoryPresenter; import com.gingersoft.gsa.cloud.main.mvp.presenter.LiquidationHistoryPresenter;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.LiquidationHistoryAdapter; import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.LiquidationHistoryAdapter;
import com.gingersoft.gsa.cloud.main.mvp.ui.view.StartEndTimePickerView; import com.gingersoft.gsa.cloud.main.mvp.ui.view.StartEndTimePickerView;
import com.gingersoft.gsa.cloud.ui.animator.CustomAnimation1;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.kingja.loadsir.callback.Callback;
import com.kingja.loadsir.core.LoadService;
import com.kingja.loadsir.core.LoadSir;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife;
import static com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementActivity.SETTLEMENT_TYPE_NOMAL;
import static com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementActivity.SETTLEMENT_TYPE_TAG;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -43,6 +50,11 @@ public class LiquidationHistoryActivity extends BaseActivity<LiquidationHistoryP ...@@ -43,6 +50,11 @@ public class LiquidationHistoryActivity extends BaseActivity<LiquidationHistoryP
StartEndTimePickerView svTimeSelect; StartEndTimePickerView svTimeSelect;
@BindView(R2.id.rv_liquidation_history_list) @BindView(R2.id.rv_liquidation_history_list)
RecyclerView rvLiquidationHistoryList; RecyclerView rvLiquidationHistoryList;
@BindView(R2.id.sr_settlement_history)
SmartRefreshLayout smartRefreshLayout;
private int pageIndex = 0;
private LoadService register;
private int mSettlementType;
@Override @Override
public void setupActivityComponent(@NonNull AppComponent appComponent) { public void setupActivityComponent(@NonNull AppComponent appComponent) {
...@@ -61,20 +73,40 @@ public class LiquidationHistoryActivity extends BaseActivity<LiquidationHistoryP ...@@ -61,20 +73,40 @@ public class LiquidationHistoryActivity extends BaseActivity<LiquidationHistoryP
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
register = LoadSir.getDefault().register(smartRefreshLayout, (Callback.OnReloadListener) v -> {
pageIndex = 0;
loadInfo();
});
smartRefreshLayout.setPrimaryColorsId(android.R.color.transparent, android.R.color.black);
svTimeSelect.setOnUpdateTimePicker((startTime, endTime) -> {
pageIndex = 0;
mPresenter.getLiquidationHistory(pageIndex, startTime, endTime);
});
mPresenter.initAdapter();
loadInfo();
smartRefreshLayout.setOnRefreshListener(refreshLayout -> {
pageIndex = 0;
loadInfo();
});
smartRefreshLayout.setOnLoadMoreListener(refreshLayout -> {
pageIndex++;
loadInfo();
});
}
// LiquidationHistoryAdapter liquidationHistoryAdapter = new LiquidationHistoryAdapter(); private void loadInfo() {
// liquidationHistoryAdapter.setAdapterAnimation(new CustomAnimation1()); mPresenter.getLiquidationHistory(pageIndex, svTimeSelect.getStartTime(), svTimeSelect.getEndTime());
// rvLiquidationHistoryList.setAdapter(liquidationHistoryAdapter);
} }
@Override @Override
public void initIntent() { public void initIntent() {
mSettlementType = getIntent().getIntExtra(SETTLEMENT_TYPE_TAG, SETTLEMENT_TYPE_NOMAL);
} }
@Override @Override
public void initTopBar() { public void initTopBar() {
topbar.setOnClickListener(v -> Log.e("eee", "點擊的控件：" + v.getId())); topbar.addLeftBackImageButton().setOnClickListener(v -> finish());
topbar.setTitle(R.string.str_title_history_settiement);
} }
@Override @Override
...@@ -123,9 +155,41 @@ public class LiquidationHistoryActivity extends BaseActivity<LiquidationHistoryP ...@@ -123,9 +155,41 @@ public class LiquidationHistoryActivity extends BaseActivity<LiquidationHistoryP
} }
@Override @Override
protected void onCreate(Bundle savedInstanceState) { public void setAdapter(LiquidationHistoryAdapter liquidationHistoryAdapter) {
super.onCreate(savedInstanceState); rvLiquidationHistoryList.setAdapter(liquidationHistoryAdapter);
// TODO: add setContentView(...) invocation liquidationHistoryAdapter.setOnItemClickListener((adapter, view, position) -> {
ButterKnife.bind(this); SettlementHistoryListBean item = liquidationHistoryAdapter.getItem(position);
String startTime = TimeUtils.stampToData(TimeUtils.DEFAULT_DATE_FORMAT_YMDHM, item.getOperationStartTime());
String endTime = TimeUtils.stampToData(TimeUtils.DEFAULT_DATE_FORMAT_YMDHM, item.getOperationTime());
mPresenter.getSettlementReport(startTime, endTime);
});
rvLiquidationHistoryList.addItemDecoration(AppConstant.getItemDecoration(this));
}
@Override
public void setLoadNoMoreData() {
smartRefreshLayout.finishLoadMoreWithNoMoreData();
}
@Override
public void setNoData() {
smartRefreshLayout.finishLoadMore();
smartRefreshLayout.finishRefresh();
register.showCallback(EmptyCallback.class);
}
@Override
public void finisLoad() {
register.showSuccess();
smartRefreshLayout.finishLoadMore();
smartRefreshLayout.finishRefresh();
}
@Override
public void toSettlementReportActivity(SettlementReport mSettlementReportBean) {
Intent intent = new Intent(this, SettlementReportActivity.class);
intent.putExtra("settlementReportBean", mSettlementReportBean);
intent.putExtra(SETTLEMENT_TYPE_TAG, mSettlementType);
launchActivity(intent);
} }
} }
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -25,7 +25,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -25,7 +25,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans; import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.common.constans.ResultConstans; import com.gingersoft.gsa.cloud.common.constans.ResultConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
...@@ -40,7 +40,6 @@ import com.gingersoft.gsa.cloud.common.service.IServiceManager; ...@@ -40,7 +40,6 @@ import com.gingersoft.gsa.cloud.common.service.IServiceManager;
import com.gingersoft.gsa.cloud.common.utils.AppDevices; import com.gingersoft.gsa.cloud.common.utils.AppDevices;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.encryption.Aes; import com.gingersoft.gsa.cloud.common.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.common.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.component.ComponentName; import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.database.bean.Function; import com.gingersoft.gsa.cloud.database.bean.Function;
...@@ -450,7 +449,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -450,7 +449,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
break; break;
case "採購": case "採購":
CC.obtainBuilder(ComponentName.COMPONENT_SUPPLYCHAIN) CC.obtainBuilder(ComponentName.COMPONENT_SUPPLYCHAIN)
.setActionName(AppConstans.SUPPLY_CHAIN_MAIN_ACTION) .setActionName(AppConstant.SUPPLY_CHAIN_MAIN_ACTION)
.build() .build()
.call(); .call();
break; break;
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementActivity.java
...@@ -46,8 +46,18 @@ public class SettlementActivity extends BaseActivity<SettlementPresenter> implem ...@@ -46,8 +46,18 @@ public class SettlementActivity extends BaseActivity<SettlementPresenter> implem
private int mSettlementType; private int mSettlementType;
public static final String SETTLEMENT_TYPE_TAG = "settlement_type"; public static final String SETTLEMENT_TYPE_TAG = "settlement_type";
/**
* 普通清機
*/
public static final int SETTLEMENT_TYPE_NOMAL = 1; public static final int SETTLEMENT_TYPE_NOMAL = 1;
/**
* N5清機
*/
public static final int SETTLEMENT_TYPE_HYWEB_POS = 2; public static final int SETTLEMENT_TYPE_HYWEB_POS = 2;
/**
* 線下清機
*/
public static final int OFFLINE_SETTLEMENT = 3;
@Override @Override
public void setupActivityComponent(@NonNull AppComponent appComponent) { public void setupActivityComponent(@NonNull AppComponent appComponent) {
...@@ -81,7 +91,9 @@ public class SettlementActivity extends BaseActivity<SettlementPresenter> implem ...@@ -81,7 +91,9 @@ public class SettlementActivity extends BaseActivity<SettlementPresenter> implem
mTopBar.addLeftBackImageButton().setOnClickListener(v -> killMyself()); mTopBar.addLeftBackImageButton().setOnClickListener(v -> killMyself());
mTopBar.addRightTextButton(R.string.str_history_record, R.id.mainId_history_record).setOnClickListener(v -> { mTopBar.addRightTextButton(R.string.str_history_record, R.id.mainId_history_record).setOnClickListener(v -> {
//清機歷史 //清機歷史
startActivity(new Intent(mContext, LiquidationHistoryActivity.class)); Intent intent = new Intent(mContext, LiquidationHistoryActivity.class);
intent.putExtra(SettlementActivity.SETTLEMENT_TYPE_TAG, mSettlementType);
startActivity(intent);
}); });
mTopBar.setTitle(LanguageUtils.get_language_system("funcSelect.settlement", "清機")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color)); mTopBar.setTitle(LanguageUtils.get_language_system("funcSelect.settlement", "清機")).setTextColor(ArmsUtils.getColor(this, R.color.theme_white_color));
} }
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/LiquidationHistoryAdapter.java
...@@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.viewholder.BaseViewHolder; import com.chad.library.adapter.base.viewholder.BaseViewHolder;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.LiquidationBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementHistoryListBean;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
...@@ -18,14 +18,14 @@ import java.util.List; ...@@ -18,14 +18,14 @@ import java.util.List;
* Time: 18:23 * Time: 18:23
* Use: * Use:
*/ */
public class LiquidationHistoryAdapter extends BaseQuickAdapter<LiquidationBean, BaseViewHolder> { public class LiquidationHistoryAdapter extends BaseQuickAdapter<SettlementHistoryListBean, BaseViewHolder> {
public LiquidationHistoryAdapter(@Nullable List<LiquidationBean> data) { public LiquidationHistoryAdapter(@Nullable List<SettlementHistoryListBean> data) {
super(R.layout.item_liquidation_layout, data); super(R.layout.item_liquidation_layout, data);
} }
@Override @Override
protected void convert(@NotNull BaseViewHolder viewHolder, LiquidationBean liquidationBean) { protected void convert(@NotNull BaseViewHolder viewHolder, SettlementHistoryListBean liquidationBean) {
viewHolder.setText(R.id.tv_liquidation_time, TimeUtils.getTime(liquidationBean.getCreateTime(), TimeUtils.DEFAULT_DATE_FORMAT)); viewHolder.setText(R.id.tv_liquidation_time, TimeUtils.getTime(liquidationBean.getOperationTime(), TimeUtils.DEFAULT_DATE_FORMAT));
viewHolder.setText(R.id.tv_liquidation_no, String.format(getContext().getString(R.string.str_clean_up_no), liquidationBean.getNo())); viewHolder.setText(R.id.tv_liquidation_no, String.format(getContext().getString(R.string.str_clean_up_no), liquidationBean.getId()+""));
} }
} }
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/StartEndTimePickerView.java
package com.gingersoft.gsa.cloud.main.mvp.ui.view; package com.gingersoft.gsa.cloud.main.mvp.ui.view;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.ui.utils.TimePickerUtils; import com.gingersoft.gsa.cloud.ui.utils.TimePickerUtils;
import com.gingersoft.gsa.cloud.ui.view.TriangleView; import com.gingersoft.gsa.cloud.ui.view.TriangleView;
import java.text.ParseException; import java.text.ParseException;
import java.util.Calendar; import java.util.Calendar;
...@@ -23,6 +31,14 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL ...@@ -23,6 +31,14 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL
private onUpdateTimePicker onUpdateTimePicker; private onUpdateTimePicker onUpdateTimePicker;
private int mTextColor;
private float mTextSize;
private float mImgWidth;
private float mImgHeight;
private Drawable mArrowRes;
private boolean showStartTime;
private boolean showEndTime;
public StartEndTimePickerView(@NonNull Context context) { public StartEndTimePickerView(@NonNull Context context) {
this(context, null, -1); this(context, null, -1);
} }
...@@ -38,20 +54,40 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL ...@@ -38,20 +54,40 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL
public StartEndTimePickerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { public StartEndTimePickerView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
init(context); init(context, attrs);
} }
public void setOnUpdateTimePicker(StartEndTimePickerView.onUpdateTimePicker onUpdateTimePicker) { public void setOnUpdateTimePicker(StartEndTimePickerView.onUpdateTimePicker onUpdateTimePicker) {
this.onUpdateTimePicker = onUpdateTimePicker; this.onUpdateTimePicker = onUpdateTimePicker;
} }
private void init(Context context) { private void init(Context context, AttributeSet attrs) {
initTypedArray(context, attrs);
View view = View.inflate(context, R.layout.layout_start_end_time_picker, null); View view = View.inflate(context, R.layout.layout_start_end_time_picker, null);
tvStartTime = view.findViewById(R.id.tv_start_time); tvStartTime = view.findViewById(R.id.tv_start_time);
startTriangleView = view.findViewById(R.id.iv_start_time_triangle); startTriangleView = view.findViewById(R.id.iv_start_time_triangle);
tvEndTime = view.findViewById(R.id.tv_end_time); tvEndTime = view.findViewById(R.id.tv_end_time);
endTriangleView = view.findViewById(R.id.iv_end_time_triangle); endTriangleView = view.findViewById(R.id.iv_end_time_triangle);
tvStartTime.setTextColor(mTextColor);
tvEndTime.setTextColor(mTextColor);
tvStartTime.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextSize);
tvEndTime.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextSize);
TextView tvInterval = view.findViewById(R.id.tv_time_interval);
tvInterval.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextSize);
tvStartTime.setVisibility(showStartTime ? VISIBLE : GONE);
tvEndTime.setVisibility(showEndTime ? VISIBLE : GONE);
if (mArrowRes != null) {
startTriangleView.setImageDrawable(mArrowRes);
endTriangleView.setImageDrawable(mArrowRes);
}
LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) startTriangleView.getLayoutParams();
layoutParams.width = (int) mImgWidth;
layoutParams.height = (int) mImgHeight;
startTriangleView.setLayoutParams(layoutParams);
endTriangleView.setLayoutParams(layoutParams);
tvStartTime.setText(TimeUtils.getOldDate(-7)); tvStartTime.setText(TimeUtils.getOldDate(-7));
tvEndTime.setText(TimeUtils.getOldDate(0)); tvEndTime.setText(TimeUtils.getOldDate(0));
...@@ -63,6 +99,18 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL ...@@ -63,6 +99,18 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL
this.addView(view); this.addView(view);
} }
private void initTypedArray(Context context, AttributeSet attrs) {
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.StartEndTimePickerView);
mTextColor = typedArray.getColor(R.styleable.StartEndTimePickerView_textColor, ContextCompat.getColor(context, R.color.color_18));
mTextSize = typedArray.getDimension(R.styleable.StartEndTimePickerView_textSize, getResources().getDimension(R.dimen.dp_10));
mImgWidth = typedArray.getDimension(R.styleable.StartEndTimePickerView_imgWidth, getResources().getDimension(R.dimen.dp_8));
mImgHeight = typedArray.getDimension(R.styleable.StartEndTimePickerView_imgHeight, getResources().getDimension(R.dimen.dp_5));
mArrowRes = typedArray.getDrawable(R.styleable.StartEndTimePickerView_arrowRes);
showStartTime = typedArray.getBoolean(R.styleable.StartEndTimePickerView_showStartTime, true);
showEndTime = typedArray.getBoolean(R.styleable.StartEndTimePickerView_showEndTime, true);
typedArray.recycle();
}
@Override @Override
public void onClick(View v) { public void onClick(View v) {
int viewId = v.getId(); int viewId = v.getId();
...@@ -123,15 +171,25 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL ...@@ -123,15 +171,25 @@ public class StartEndTimePickerView extends FrameLayout implements View.OnClickL
void onUpdateTime(String startTime, String endTime); void onUpdateTime(String startTime, String endTime);
} }
public String getStartTime(){ public StartEndTimePickerView setStartTime(String startTime) {
if(tvStartTime != null){ tvStartTime.setText(startTime);
return this;
}
public StartEndTimePickerView setEndTime(String endTime) {
tvEndTime.setText(endTime);
return this;
}
public String getStartTime() {
if (tvStartTime != null) {
return tvStartTime.getText().toString(); return tvStartTime.getText().toString();
} }
return TimeUtils.getOldDate(-7); return TimeUtils.getOldDate(-7);
} }
public String getEndTime(){ public String getEndTime() {
if(tvEndTime != null){ if (tvEndTime != null) {
return tvEndTime.getText().toString(); return tvEndTime.getText().toString();
} }
return TimeUtils.getOldDate(0); return TimeUtils.getOldDate(0);
......
component-main/src/main/res/layout/activity_liquidation_history.xml
...@@ -23,14 +23,22 @@ ...@@ -23,14 +23,22 @@
<com.gingersoft.gsa.cloud.main.mvp.ui.view.StartEndTimePickerView <com.gingersoft.gsa.cloud.main.mvp.ui.view.StartEndTimePickerView
android:id="@+id/sv_time_select" android:id="@+id/sv_time_select"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_4"
app:textColor="@color/color_18"
app:textSize="@dimen/dp_16" />
</LinearLayout> </LinearLayout>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/sr_settlement_history"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_liquidation_history_list" android:id="@+id/rv_liquidation_history_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
component-main/src/main/res/layout/include_main_topbar.xml
...@@ -5,4 +5,6 @@ ...@@ -5,4 +5,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/head_height" android:layout_height="@dimen/head_height"
android:background="@color/theme_color" android:background="@color/theme_color"
app:qmui_topbar_left_back_drawable_id="@drawable/qmui_icon_topbar_back" /> app:qmui_topbar_left_back_drawable_id="@drawable/qmui_icon_topbar_back"
\ No newline at end of file app:qmui_topbar_text_btn_color_state_list="@color/white"
app:qmui_topbar_title_color="@color/white" />
\ No newline at end of file
component-main/src/main/res/layout/layout_start_end_time_picker.xml
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
app:trv_direction="bottom" /> app:trv_direction="bottom" />
<TextView <TextView
android:id="@+id/tv_time_interval"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_7" android:layout_marginLeft="@dimen/dp_7"
......
component-main/src/main/res/values/attrs.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="StartEndTimePickerView">
<attr name="textColor" format="color" />
<attr name="textSize" format="dimension" />
<attr name="imgWidth" format="dimension"/>
<attr name="imgHeight" format="dimension"/>
<attr name="arrowRes" format="reference" />
<attr name="showStartTime" format="boolean" />
<attr name="showEndTime" format="boolean" />
</declare-styleable>
</resources>
\ No newline at end of file
component-main/src/main/res/values/strings.xml
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<string name="main">首頁</string> <string name="main">首頁</string>
<string name="report">報表</string> <string name="report">報表</string>
<string name="my">我的</string> <string name="my">我的</string>
<string name="str_title_history_settiement">歷史清機</string>
<string name="turnover_today">今日營業額（$）</string> <string name="turnover_today">今日營業額（$）</string>
<string name="cutoff">截止</string> <string name="cutoff">截止</string>
<string name="total_amount_of_project">項目總金額</string> <string name="total_amount_of_project">項目總金額</string>
<string name="number_of_consumers">消費人數</string> <string name="number_of_consumers">消費人數</string>
<string name="bill_number">賬單數</string> <string name="bill_number">賬單數</string>
<string name="main_action_settings">Settings</string> <string name="main_action_settings">Settings</string>
<string name="configuration">配置</string> <string name="configuration">配置</string>
......
component-pay/src/main/java/com/gingersoft/gsa/cloud/pay/mvp/ui/activity/PayResultActivity.java
...@@ -15,7 +15,7 @@ import androidx.annotation.Nullable; ...@@ -15,7 +15,7 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCUtil; import com.billy.cc.core.component.CCUtil;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.loadsir.pos.BasePosCallback; import com.gingersoft.gsa.cloud.common.loadsir.pos.BasePosCallback;
...@@ -238,9 +238,9 @@ public class PayResultActivity extends BaseFragmentActivity<PayResultPresenter> ...@@ -238,9 +238,9 @@ public class PayResultActivity extends BaseFragmentActivity<PayResultPresenter>
private String getPayAmount() { private String getPayAmount() {
if (mSaleRespose.getTIPS() != 0) { if (mSaleRespose.getTIPS() != 0) {
return AppConstans.CARSH_STR + MoneyUtil.sum(mSaleRespose.getTXN_AMT(), mSaleRespose.getTIPS()) + "(含小費" + mSaleRespose.getTIPS() + ")"; return AppConstant.CARSH_STR + MoneyUtil.sum(mSaleRespose.getTXN_AMT(), mSaleRespose.getTIPS()) + "(含小費" + mSaleRespose.getTIPS() + ")";
} else { } else {
return AppConstans.CARSH_STR + mSaleRespose.getTXN_AMT(); return AppConstant.CARSH_STR + mSaleRespose.getTXN_AMT();
} }
} }
......
component-pay/src/main/java/com/gingersoft/gsa/cloud/pay/mvp/ui/adapter/ResultBillItemAdapter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.pay.mvp.ui.adapter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.pay.mvp.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.viewholder.BaseViewHolder; import com.chad.library.adapter.base.viewholder.BaseViewHolder;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.order.billItem.BillItem; import com.gingersoft.gsa.cloud.order.billItem.BillItem;
import com.gingersoft.gsa.cloud.pay.R; import com.gingersoft.gsa.cloud.pay.R;
...@@ -49,7 +49,7 @@ public class ResultBillItemAdapter extends BaseQuickAdapter<BillItem, BaseViewHo ...@@ -49,7 +49,7 @@ public class ResultBillItemAdapter extends BaseQuickAdapter<BillItem, BaseViewHo
// baseViewHolder.setText(R.id.tv_pay_method, billItem.getName()); // baseViewHolder.setText(R.id.tv_pay_method, billItem.getName());
// } else { // } else {
baseViewHolder.setText(R.id.tv_name, billItem.getName()); baseViewHolder.setText(R.id.tv_name, billItem.getName());
baseViewHolder.setText(R.id.tv_money, AppConstans.CARSH_STR + billItem.getMoney()); baseViewHolder.setText(R.id.tv_money, AppConstant.CARSH_STR + billItem.getMoney());
baseViewHolder.setBackgroundColor(R.id.ll_container,billItem.getBgColor()); baseViewHolder.setBackgroundColor(R.id.ll_container,billItem.getBgColor());
// } // }
} }
......
component-print/src/main/java/com/joe/print/mvp/print/PrintBill.java
...@@ -5,7 +5,7 @@ import android.graphics.Bitmap; ...@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo; import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
...@@ -111,7 +111,7 @@ public class PrintBill extends PrinterRoot<PrintBillContent> { ...@@ -111,7 +111,7 @@ public class PrintBill extends PrinterRoot<PrintBillContent> {
//合計 //合計
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, "合計:"), new HtmlLable(LABLE_COLUMN, "合計:"),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + mPrintBillContent.getWholeAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 28)); new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + mPrintBillContent.getWholeAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 28));
List<PrintBillItem> billItemList = mPrintBillContent.getBillItemList(); List<PrintBillItem> billItemList = mPrintBillContent.getBillItemList();
if (billItemList.size() > 0) { if (billItemList.size() > 0) {
...@@ -125,7 +125,7 @@ public class PrintBill extends PrinterRoot<PrintBillContent> { ...@@ -125,7 +125,7 @@ public class PrintBill extends PrinterRoot<PrintBillContent> {
//總金額 //總金額
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, "總金額:"), new HtmlLable(LABLE_COLUMN, "總金額:"),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + mPrintBillContent.getTotalAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 35)); new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + mPrintBillContent.getTotalAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 35));
htmlLables.add(new HtmlLable(LABLE_P, HtmlContract.dividing_line)); htmlLables.add(new HtmlLable(LABLE_P, HtmlContract.dividing_line));
//支付方式 //支付方式
......
component-print/src/main/java/com/joe/print/mvp/print/PrintCleanMachine.java
...@@ -4,7 +4,7 @@ import android.content.Context; ...@@ -4,7 +4,7 @@ import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.view.View; import android.view.View;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport; import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
...@@ -12,7 +12,6 @@ import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; ...@@ -12,7 +12,6 @@ import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.PrintTransitUtils; import com.gingersoft.gsa.cloud.common.utils.PrintTransitUtils;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.contract.PayMethodContract; import com.gingersoft.gsa.cloud.pay.contract.PayMethodContract;
import com.gingersoft.gsa.cloud.print.bean.PrintCleanMachineContent; import com.gingersoft.gsa.cloud.print.bean.PrintCleanMachineContent;
import com.joe.print.mvp.model.bean.HtmlLable; import com.joe.print.mvp.model.bean.HtmlLable;
...@@ -137,14 +136,14 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -137,14 +136,14 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
String[] items = {"項目銷售總額", "折扣", "服務費", "送貨費", "營業今個淨值", "", "現金核數", "營業金額淨值"}; String[] items = {"項目銷售總額", "折扣", "服務費", "送貨費", "營業今個淨值", "", "現金核數", "營業金額淨值"};
List<String> items2 = new ArrayList<>(); List<String> items2 = new ArrayList<>();
items2.add(AppConstans.CARSH_STR + voBean.getPrices()); items2.add(AppConstant.CARSH_STR + voBean.getPrices());
items2.add(AppConstans.CARSH_STR + voBean.getDisamount()); items2.add(AppConstant.CARSH_STR + voBean.getDisamount());
items2.add(AppConstans.CARSH_STR + voBean.getScamount()); items2.add(AppConstant.CARSH_STR + voBean.getScamount());
items2.add(AppConstans.CARSH_STR + voBean.getDeliverycharge()); items2.add(AppConstant.CARSH_STR + voBean.getDeliverycharge());
items2.add(AppConstans.CARSH_STR + voBean.getTotamount()); items2.add(AppConstant.CARSH_STR + voBean.getTotamount());
items2.add(""); items2.add("");
items2.add(""); items2.add("");
items2.add(AppConstans.CARSH_STR + voBean.getTotamount()); items2.add(AppConstant.CARSH_STR + voBean.getTotamount());
for (int i = 0; i < items.length; i++) { for (int i = 0; i < items.length; i++) {
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
...@@ -158,7 +157,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -158,7 +157,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, cashBean.getPayName()), new HtmlLable(LABLE_COLUMN, cashBean.getPayName()),
new HtmlLable(LABLE_COLUMN, String.valueOf(cashBean.getPayNum()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)), new HtmlLable(LABLE_COLUMN, String.valueOf(cashBean.getPayNum()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + cashBean.getPayAmount(), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last)) new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + cashBean.getPayAmount(), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last))
}, 24)); }, 24));
} }
} }
...@@ -187,7 +186,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -187,7 +186,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, cashBean.getPayName()), new HtmlLable(LABLE_COLUMN, cashBean.getPayName()),
new HtmlLable(LABLE_COLUMN, String.valueOf(cashBean.getPayNum()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)), new HtmlLable(LABLE_COLUMN, String.valueOf(cashBean.getPayNum()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + cashBean.getPayAmount(), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last)) new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + cashBean.getPayAmount(), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last))
}, 22)); }, 22));
break; break;
} }
...@@ -219,7 +218,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -219,7 +218,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, "帳單金額總數"), new HtmlLable(LABLE_COLUMN, "帳單金額總數"),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + voBean.getTotamount(), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last)) new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + voBean.getTotamount(), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last))
}, 22)); }, 22));
htmlLables.add(new HtmlLable(getRowLableStart())); htmlLables.add(new HtmlLable(getRowLableStart()));
...@@ -231,7 +230,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -231,7 +230,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, "帳單數目"), new HtmlLable(LABLE_COLUMN, "帳單數目"),
new HtmlLable(LABLE_COLUMN, String.valueOf(voBean.getNum()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)), new HtmlLable(LABLE_COLUMN, String.valueOf(voBean.getNum()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + averagePrice, new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last)) new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + averagePrice, new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last))
}, 22)); }, 22));
String averageConsumption = "0.00"; String averageConsumption = "0.00";
...@@ -242,7 +241,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -242,7 +241,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, "人數 / 平均消費"), new HtmlLable(LABLE_COLUMN, "人數 / 平均消費"),
new HtmlLable(LABLE_COLUMN, String.valueOf(voBean.getPerson()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)), new HtmlLable(LABLE_COLUMN, String.valueOf(voBean.getPerson()), new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_percentage60)),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + averageConsumption, new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last)) new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + averageConsumption, new HtmlLable.Attributes(ATTRIBUTES_OFFSET, value_offset_last))
}, 22)); }, 22));
// htmlLables.add(new HtmlLable(LABLE_P, HtmlContract.dividing_line)); // htmlLables.add(new HtmlLable(LABLE_P, HtmlContract.dividing_line));
...@@ -296,16 +295,16 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -296,16 +295,16 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
int num = analysisBean.getNum(); int num = analysisBean.getNum();
if (voBean.getNum() != 0) { if (voBean.getNum() != 0) {
double number = MoneyUtil.divide(amount, num, 2); double number = MoneyUtil.divide(amount, num, 2);
averagePrice = AppConstans.CARSH_STR + MoneyUtil.get_ItemDecimals_money(number); averagePrice = AppConstant.CARSH_STR + MoneyUtil.get_ItemDecimals_money(number);
} }
if (amount > 0) { if (amount > 0) {
percentage = AppConstans.CARSH_STR + MoneyUtil.get_ItemDecimals_money((MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100)); percentage = AppConstant.CARSH_STR + MoneyUtil.get_ItemDecimals_money((MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100));
} }
items2.add(analysisBean.getTypeName()); items2.add(analysisBean.getTypeName());
items2.add(String.valueOf(analysisBean.getNum())); items2.add(String.valueOf(analysisBean.getNum()));
items2.add(AppConstans.CARSH_STR + analysisBean.getAmount()); items2.add(AppConstant.CARSH_STR + analysisBean.getAmount());
items2.add(AppConstans.CARSH_STR + averagePrice); items2.add(AppConstant.CARSH_STR + averagePrice);
items2.add(AppConstans.CARSH_STR + percentage); items2.add(AppConstant.CARSH_STR + percentage);
for (int i = 0; i < items.length; i++) { for (int i = 0; i < items.length; i++) {
htmlLables.add(new HtmlLable(getRowLableStart(new HtmlLable.Attributes(ATTRIBUTES_FONT_SIZE, "22")))); htmlLables.add(new HtmlLable(getRowLableStart(new HtmlLable.Attributes(ATTRIBUTES_FONT_SIZE, "22"))));
htmlLables.add(new HtmlLable(LABLE_COLUMN, items[i])); htmlLables.add(new HtmlLable(LABLE_COLUMN, items[i]));
...@@ -348,7 +347,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -348,7 +347,7 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
items.add(analysisBean.getTypeName()); items.add(analysisBean.getTypeName());
items2.add(String.valueOf(analysisBean.getNum())); items2.add(String.valueOf(analysisBean.getNum()));
items3.add(String.valueOf(analysisBean.getPerson())); items3.add(String.valueOf(analysisBean.getPerson()));
items4.add(AppConstans.CARSH_STR + analysisBean.getAmount()); items4.add(AppConstant.CARSH_STR + analysisBean.getAmount());
} }
} }
...@@ -405,9 +404,9 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -405,9 +404,9 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
items2.add(""); items2.add("");
items2.add(""); items2.add("");
if (analysisBean != null) { if (analysisBean != null) {
items2.add(AppConstans.CARSH_STR + analysisBean.getAmount()); items2.add(AppConstant.CARSH_STR + analysisBean.getAmount());
} else { } else {
items2.add(AppConstans.CARSH_STR + "0.00"); items2.add(AppConstant.CARSH_STR + "0.00");
} }
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
......
component-print/src/main/java/com/joe/print/mvp/print/PrintSlip.java
...@@ -5,7 +5,7 @@ import android.graphics.Bitmap; ...@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
import android.view.Gravity; import android.view.Gravity;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.logan.LoganManager; import com.gingersoft.gsa.cloud.common.logan.LoganManager;
...@@ -134,7 +134,7 @@ public class PrintSlip extends PrinterRoot<PrintSlipContent> { ...@@ -134,7 +134,7 @@ public class PrintSlip extends PrinterRoot<PrintSlipContent> {
//合計 //合計
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, "合計:"), new HtmlLable(LABLE_COLUMN, "合計:"),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + mPrintSlipContent.getWholeAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 28)); new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + mPrintSlipContent.getWholeAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 28));
List<PrintBillItem> billItemList = mPrintSlipContent.getBillItemList(); List<PrintBillItem> billItemList = mPrintSlipContent.getBillItemList();
if (billItemList.size() > 0) { if (billItemList.size() > 0) {
...@@ -148,7 +148,7 @@ public class PrintSlip extends PrinterRoot<PrintSlipContent> { ...@@ -148,7 +148,7 @@ public class PrintSlip extends PrinterRoot<PrintSlipContent> {
//總金額 //總金額
htmlLables.addAll(getRowInformation(new HtmlLable[]{ htmlLables.addAll(getRowInformation(new HtmlLable[]{
new HtmlLable(LABLE_COLUMN, "總金額:"), new HtmlLable(LABLE_COLUMN, "總金額:"),
new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + mPrintSlipContent.getTotalAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 35)); new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + mPrintSlipContent.getTotalAmount(), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))}, 35));
htmlLables.add(new HtmlLable(LABLE_P, HtmlContract.dividing_line)); htmlLables.add(new HtmlLable(LABLE_P, HtmlContract.dividing_line));
/** /**
......
component-print/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
...@@ -9,7 +9,6 @@ import android.os.Build; ...@@ -9,7 +9,6 @@ import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.SparseArray;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -26,7 +25,7 @@ import com.epson.epos2.printer.Printer; ...@@ -26,7 +25,7 @@ import com.epson.epos2.printer.Printer;
import com.epson.epos2.printer.PrinterStatusInfo; import com.epson.epos2.printer.PrinterStatusInfo;
import com.epson.epos2.printer.ReceiveListener; import com.epson.epos2.printer.ReceiveListener;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.DeliveryPickConstans; import com.gingersoft.gsa.cloud.common.constans.DeliveryPickConstans;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
...@@ -1356,11 +1355,11 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintExecut ...@@ -1356,11 +1355,11 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintExecut
} }
if (amount != -9999) { if (amount != -9999) {
if (isBold) { if (isBold) {
htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + amount, htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + amount,
new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_BOLD, HtmlContract.value_bold_1), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_BOLD, HtmlContract.value_bold_1),
new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))); new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last)));
} else { } else {
htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + amount, new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))); htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + amount, new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last)));
} }
} }
htmlLables.add(new HtmlLable(getRowLableEnd())); htmlLables.add(new HtmlLable(getRowLableEnd()));
...@@ -1393,11 +1392,11 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintExecut ...@@ -1393,11 +1392,11 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintExecut
} }
if (amount != -9999) { if (amount != -9999) {
if (isBold) { if (isBold) {
htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + amount, htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + amount,
new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_BOLD, HtmlContract.value_bold_1), new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_BOLD, HtmlContract.value_bold_1),
new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))); new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last)));
} else { } else {
htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstans.CARSH_STR + amount, new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last))); htmlLables.add(new HtmlLable(LABLE_COLUMN, AppConstant.CARSH_STR + amount, new HtmlLable.Attributes(HtmlContract.ATTRIBUTES_OFFSET, HtmlContract.value_offset_last)));
} }
} }
htmlLables.add(new HtmlLable(getRowLableEnd())); htmlLables.add(new HtmlLable(getRowLableEnd()));
......
component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
...@@ -422,12 +422,8 @@ public class PrjService extends Service implements ReceiveListener { ...@@ -422,12 +422,8 @@ public class PrjService extends Service implements ReceiveListener {
} }
break; break;
case PRINT_LOCAL: case PRINT_LOCAL:
if (PrintConstans.PRINT_MODEL_WISEPOS.contains(Build.MODEL)) { //本地打印
//BBPOS
} else {
//本地N5或Sunmi打印
locationPrint(bitmapMaps); locationPrint(bitmapMaps);
}
break; break;
case PRINT_USB: case PRINT_USB:
LoganManager.w_printer(TAG, "開始USB打印-->"); LoganManager.w_printer(TAG, "開始USB打印-->");
......
component-print/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
...@@ -4,6 +4,7 @@ import android.content.Intent; ...@@ -4,6 +4,7 @@ import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.WindowManager; import android.view.WindowManager;
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/ComponentSupplyChain.java
package com.gingersoft.supply_chain; package com.gingersoft.supply_chain;
import android.util.Log;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCResult; import com.billy.cc.core.component.CCResult;
import com.billy.cc.core.component.CCUtil; import com.billy.cc.core.component.CCUtil;
import com.billy.cc.core.component.IComponent; import com.billy.cc.core.component.IComponent;
import com.gingersoft.gsa.cloud.component.ComponentName; import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.supply_chain.mvp.ui.activity.SupplyChainMainActivity; import com.gingersoft.supply_chain.mvp.ui.activity.SupplyChainMainActivity;
public class ComponentSupplyChain implements IComponent { public class ComponentSupplyChain implements IComponent {
...@@ -31,7 +30,7 @@ public class ComponentSupplyChain implements IComponent { ...@@ -31,7 +30,7 @@ public class ComponentSupplyChain implements IComponent {
public boolean onCall(CC cc) { public boolean onCall(CC cc) {
String actionName = cc.getActionName(); String actionName = cc.getActionName();
switch (actionName) { switch (actionName) {
case AppConstans.SUPPLY_CHAIN_MAIN_ACTION: case AppConstant.SUPPLY_CHAIN_MAIN_ACTION:
CCUtil.navigateTo(cc, SupplyChainMainActivity.class); CCUtil.navigateTo(cc, SupplyChainMainActivity.class);
CC.sendCCResult(cc.getCallId(), CCResult.success()); CC.sendCCResult(cc.getCallId(), CCResult.success());
break; break;
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/ConfirmOrderBean.java
package com.gingersoft.supply_chain.mvp.bean; package com.gingersoft.supply_chain.mvp.bean;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
...@@ -51,8 +51,8 @@ public class ConfirmOrderBean { ...@@ -51,8 +51,8 @@ public class ConfirmOrderBean {
PurchaseOrder purchaseOrder = new PurchaseOrder(); PurchaseOrder purchaseOrder = new PurchaseOrder();
purchaseOrder.setSupplierId(shoppingCartBean.getSupplierId()); purchaseOrder.setSupplierId(shoppingCartBean.getSupplierId());
purchaseOrder.setSupplierName(shoppingCartBean.getSupplierName()); purchaseOrder.setSupplierName(shoppingCartBean.getSupplierName());
purchaseOrder.setBrandId(PurchaseConstant.getBrandId()); purchaseOrder.setBrandId(AppConstant.getBrandId());
purchaseOrder.setRestaurantId(PurchaseConstant.getRestaurantId()); purchaseOrder.setRestaurantId(AppConstant.getRestaurantId());
purchaseOrder.setRemarks(shoppingCartBean.getRemarks()); purchaseOrder.setRemarks(shoppingCartBean.getRemarks());
purchaseOrder.setInitialShippingTime(shoppingCartBean.getInitialShippingTime()); purchaseOrder.setInitialShippingTime(shoppingCartBean.getInitialShippingTime());
purchaseOrder.setShipping(shoppingCartBean.getShipping()); purchaseOrder.setShipping(shoppingCartBean.getShipping());
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/content/PurchaseConstant.java
...@@ -15,7 +15,6 @@ import okhttp3.FormBody; ...@@ -15,7 +15,6 @@ import okhttp3.FormBody;
* Use: * Use:
*/ */
public class PurchaseConstant { public class PurchaseConstant {
public static final int PAGE_SIZE = 10;
public static final int PURCHASE_FOOD_MAX = 9999; public static final int PURCHASE_FOOD_MAX = 9999;
/** /**
* 长按时，初始间隔 * 长按时，初始间隔
...@@ -40,65 +39,4 @@ public class PurchaseConstant { ...@@ -40,65 +39,4 @@ public class PurchaseConstant {
* 上傳圖片類型：訂單收貨圖 * 上傳圖片類型：訂單收貨圖
*/ */
public static final int UPLOAD_PIC_TYPE_ORDER = 2; public static final int UPLOAD_PIC_TYPE_ORDER = 2;
/**
* 逗號分隔符
*/
public static final String COMMA_SEPARATED = ",";
public static final String GET_INFO_ERROR = "數據獲取失敗，請稍候再試";
public static final String INFO_SYNTAX_ERROR = "數據解析失敗，請聯繫開發人員";
public static final String GET_INFO_LOADING = "數據獲取中...";
public static final String QUERY_LOADING = "查詢中...";
public static final String IMG_UPLOAD_LOADING = "圖片上傳中...";
public static final String IMG_UPLOAD_FAIL = "圖片上傳失敗，請稍後重試";
public static final String NULL_INFO_ERROR = "未獲取到數據，請退出後重試";
public static final String SAVE_LOADING = "保存中...";
public static final String SAVE_SUCCESS = "保存成功";
public static final String SAVE_FAIL = "保存失敗，請稍後重試";
public static final String UPDATE_LOADING = "修改中...";
public static final String UPDATE_SUCCESS = "修改成功";
public static final String UPDATE_FAIL = "修改失敗，請稍後重試";
public static final String DELETE_LOADING = "刪除中...";
public static final String DELETE_SUCCESS = "刪除成功";
public static final String DELETE_FAIL = "刪除失敗，請稍後重試";
public static int getBrandId() {
return RestaurantInfoManager.newInstance().getBrandId();
// return BuildConfig.DEBUG ? 1 : RestaurantInfoManager.newInstance().getBrandId();
}
public static int getRestaurantId() {
return RestaurantInfoManager.newInstance().getRestaurantId();
// return BuildConfig.DEBUG ? 26 : RestaurantInfoManager.newInstance().getRestaurantId();
}
public static void addBrandId(@NonNull Map<String, Object> map) {
map.put("brandId", getBrandId());
}
public static void addRestaurantId(@NonNull Map<String, Object> map) {
map.put("restaurantId", getRestaurantId());
}
public static void addBrandId(@NonNull FormBody.Builder builder) {
builder.add("brandId", String.valueOf(getBrandId()));
}
public static void addRestaurantId(@NonNull FormBody.Builder builder) {
builder.add("restaurantId", String.valueOf(getRestaurantId()));
}
public static void addPageSize(Map<String, Object> map) {
map.put("pageSize", PAGE_SIZE);
}
public static void addPageIndex(Map<String, Object> map, int pageIndex) {
map.put("pageIndex", pageIndex * PAGE_SIZE);
}
} }
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/BuyIngredientsPresenter.java
...@@ -4,6 +4,7 @@ import android.app.Application; ...@@ -4,6 +4,7 @@ import android.app.Application;
import android.util.Log; import android.util.Log;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -12,7 +13,6 @@ import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean; ...@@ -12,7 +13,6 @@ import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean; import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean; import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart; import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
...@@ -31,11 +31,9 @@ import com.gingersoft.supply_chain.mvp.contract.BuyIngredientsContract; ...@@ -31,11 +31,9 @@ import com.gingersoft.supply_chain.mvp.contract.BuyIngredientsContract;
import com.jess.arms.utils.RxLifecycleUtils; import com.jess.arms.utils.RxLifecycleUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
...@@ -129,11 +127,11 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac ...@@ -129,11 +127,11 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac
return; return;
} }
Map<String, Object> map = new HashMap<>(2); Map<String, Object> map = new HashMap<>(2);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
mModel.getCategoryTrees(map)//發送請求 mModel.getCategoryTrees(map)//發送請求
.subscribeOn(Schedulers.io())//切換到io異步線程 .subscribeOn(Schedulers.io())//切換到io異步線程
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING))//顯示加載提示框 .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))//顯示加載提示框
.subscribeOn(AndroidSchedulers.mainThread())//切換到主線程，上面的提示框就在主線程 .subscribeOn(AndroidSchedulers.mainThread())//切換到主線程，上面的提示框就在主線程
.observeOn(AndroidSchedulers.mainThread())//切換到主線程，隱藏提示框在主線程 .observeOn(AndroidSchedulers.mainThread())//切換到主線程，隱藏提示框在主線程
.doAfterTerminate(() -> mRootView.hideLoading())//任務執行完成後，隱藏提示框 .doAfterTerminate(() -> mRootView.hideLoading())//任務執行完成後，隱藏提示框
...@@ -159,7 +157,7 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac ...@@ -159,7 +157,7 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac
} else if (TextUtil.isNotEmptyOrNullOrUndefined(orderCategoryBean.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(orderCategoryBean.getErrMsg())) {
mRootView.showMessage(orderCategoryBean.getErrMsg()); mRootView.showMessage(orderCategoryBean.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
} }
} }
}); });
...@@ -177,8 +175,8 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac ...@@ -177,8 +175,8 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
map.put("parentId", categoryTrees.getId()); map.put("parentId", categoryTrees.getId());
mModel.getFoodByCategory(map) mModel.getFoodByCategory(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
...@@ -330,14 +328,14 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac ...@@ -330,14 +328,14 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
if (supplierId != -1) { if (supplierId != -1) {
map.put("supplierId", supplierId); map.put("supplierId", supplierId);
} }
mModel.getFoodIngredientsData(map) mModel.getFoodIngredientsData(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -436,8 +434,8 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac ...@@ -436,8 +434,8 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
if (foodCategoryTrees != null) { if (foodCategoryTrees != null) {
map.put("supplierId", foodCategoryTrees.getId()); map.put("supplierId", foodCategoryTrees.getId());
} }
...@@ -483,7 +481,7 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac ...@@ -483,7 +481,7 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac
public void deleteFood(int foodId, int categoryPosition, int groupPosition, int position) { public void deleteFood(int foodId, int categoryPosition, int groupPosition, int position) {
mModel.deleteFood(foodId) mModel.deleteFood(foodId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.DELETE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.DELETE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterNext(dis -> mRootView.hideLoading()) .doAfterNext(dis -> mRootView.hideLoading())
...@@ -504,7 +502,7 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac ...@@ -504,7 +502,7 @@ public class BuyIngredientsPresenter extends BasePresenter<BuyIngredientsContrac
} else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.DELETE_FAIL); mRootView.showMessage(AppConstant.DELETE_FAIL);
} }
} }
}); });
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/CategoryPresenter.java
...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
...@@ -78,11 +79,11 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -78,11 +79,11 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
*/ */
public void getCategoryTrees() { public void getCategoryTrees() {
Map<String, Object> map = new HashMap<>(2); Map<String, Object> map = new HashMap<>(2);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
mModel.getCategoryTrees(map) mModel.getCategoryTrees(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -96,7 +97,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -96,7 +97,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
} else if (TextUtil.isNotEmptyOrNullOrUndefined(orderCategoryBean.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(orderCategoryBean.getErrMsg())) {
mRootView.showMessage(orderCategoryBean.getErrMsg()); mRootView.showMessage(orderCategoryBean.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
} }
} }
...@@ -121,7 +122,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -121,7 +122,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(foodCategoryBean)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(foodCategoryBean));
mModel.createFoodCategory(requestBody) mModel.createFoodCategory(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.SAVE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.SAVE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -143,7 +144,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -143,7 +144,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
} else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) {
mRootView.showMessage(info.getErrMsg()); mRootView.showMessage(info.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.SAVE_FAIL); mRootView.showMessage(AppConstant.SAVE_FAIL);
} }
} }
} }
...@@ -159,8 +160,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -159,8 +160,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
*/ */
public FoodCategoryResultBean.DataBean.FoodCategoryBean toFoodCategoryBean(int parentId, String categoryName, int id) { public FoodCategoryResultBean.DataBean.FoodCategoryBean toFoodCategoryBean(int parentId, String categoryName, int id) {
FoodCategoryResultBean.DataBean.FoodCategoryBean foodCategoryBean = new FoodCategoryResultBean.DataBean.FoodCategoryBean(); FoodCategoryResultBean.DataBean.FoodCategoryBean foodCategoryBean = new FoodCategoryResultBean.DataBean.FoodCategoryBean();
foodCategoryBean.setBrandId(PurchaseConstant.getBrandId()); foodCategoryBean.setBrandId(AppConstant.getBrandId());
foodCategoryBean.setRestaurantId(PurchaseConstant.getRestaurantId()); foodCategoryBean.setRestaurantId(AppConstant.getRestaurantId());
foodCategoryBean.setName(categoryName); foodCategoryBean.setName(categoryName);
foodCategoryBean.setParentId(parentId); foodCategoryBean.setParentId(parentId);
foodCategoryBean.setId(id); foodCategoryBean.setId(id);
...@@ -177,12 +178,12 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -177,12 +178,12 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
public void deleteFoodCategory(OrderCategoryBean.FoodCategoryTrees foodCategoryTrees, int hierarchy, int position) { public void deleteFoodCategory(OrderCategoryBean.FoodCategoryTrees foodCategoryTrees, int hierarchy, int position) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("id", foodCategoryTrees.getId() + "") .add("id", foodCategoryTrees.getId() + "")
.add("brandId", PurchaseConstant.getBrandId() + "") .add("brandId", AppConstant.getBrandId() + "")
.add("restaurantId", PurchaseConstant.getRestaurantId() + "") .add("restaurantId", AppConstant.getRestaurantId() + "")
.build(); .build();
mModel.deleteFoodCategory(requestBody) mModel.deleteFoodCategory(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.DELETE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.DELETE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -197,7 +198,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -197,7 +198,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
} else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) {
mRootView.showMessage(info.getErrMsg()); mRootView.showMessage(info.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.DELETE_FAIL); mRootView.showMessage(AppConstant.DELETE_FAIL);
} }
} }
}); });
...@@ -215,7 +216,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -215,7 +216,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(foodCategoryBean)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(foodCategoryBean));
mModel.updateFoodCategory(requestBody) mModel.updateFoodCategory(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.UPDATE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.UPDATE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -228,7 +229,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -228,7 +229,7 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
} else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) {
mRootView.showMessage(info.getErrMsg()); mRootView.showMessage(info.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.UPDATE_FAIL); mRootView.showMessage(AppConstant.UPDATE_FAIL);
} }
} }
}); });
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/FoodIngredientsPresenter.java
...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean; import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean;
...@@ -11,7 +12,6 @@ import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean; ...@@ -11,7 +12,6 @@ import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean; import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean; import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart; import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart;
import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract; import com.gingersoft.supply_chain.mvp.contract.FoodIngredientsContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
...@@ -112,14 +112,14 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -112,14 +112,14 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
if (supplierId != -1) { if (supplierId != -1) {
map.put("supplierId", supplierId); map.put("supplierId", supplierId);
} }
mModel.getFoodIngredientsData(map) mModel.getFoodIngredientsData(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -212,14 +212,14 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -212,14 +212,14 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
if (supplierId != -1) { if (supplierId != -1) {
map.put("supplierId", supplierId); map.put("supplierId", supplierId);
} }
mModel.getFoodBySupplierId(map) mModel.getFoodBySupplierId(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -355,11 +355,11 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -355,11 +355,11 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
return; return;
} }
Map<String, Object> map = new HashMap<>(2); Map<String, Object> map = new HashMap<>(2);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
mModel.getCategoryTrees(map) mModel.getCategoryTrees(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -388,7 +388,7 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -388,7 +388,7 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
} else if (TextUtil.isNotEmptyOrNullOrUndefined(orderCategoryBean.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(orderCategoryBean.getErrMsg())) {
mRootView.showMessage(orderCategoryBean.getErrMsg()); mRootView.showMessage(orderCategoryBean.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
} }
} }
...@@ -568,8 +568,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -568,8 +568,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
map.put("parentId", parentCategoryId); map.put("parentId", parentCategoryId);
mModel.getFoodByCategory(map) mModel.getFoodByCategory(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/FoodUnitPagePresenter.java
...@@ -4,6 +4,7 @@ import android.app.Application; ...@@ -4,6 +4,7 @@ import android.app.Application;
import android.os.Bundle; import android.os.Bundle;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -35,10 +36,6 @@ import java.util.ArrayList; ...@@ -35,10 +36,6 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.GET_INFO_ERROR;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.GET_INFO_LOADING;
/** /**
* ================================================ * ================================================
* Description: * Description:
...@@ -120,9 +117,9 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -120,9 +117,9 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
* 獲取副單位 快捷輸入列表數據集合 * 獲取副單位 快捷輸入列表數據集合
*/ */
public void getDeputyUnitList() { public void getDeputyUnitList() {
mModel.getDeputyUnitList(PurchaseConstant.getBrandId(), PurchaseConstant.getRestaurantId()) mModel.getDeputyUnitList(AppConstant.getBrandId(), AppConstant.getRestaurantId())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -181,7 +178,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -181,7 +178,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
deputyUnitBean.setDeletes(PurchaseConstant.DELETE); deputyUnitBean.setDeletes(PurchaseConstant.DELETE);
mModel.updateDeputyUnit(RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(deputyUnitBean))) mModel.updateDeputyUnit(RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(deputyUnitBean)))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.DELETE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.DELETE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -195,7 +192,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -195,7 +192,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
} else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.DELETE_FAIL); mRootView.showMessage(AppConstant.DELETE_FAIL);
} }
} }
}); });
...@@ -207,7 +204,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -207,7 +204,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
public void batchUpdateDeputyUnit(List<DeputyUnitBean> data) { public void batchUpdateDeputyUnit(List<DeputyUnitBean> data) {
mModel.updateDeputyUnitList(RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(data))) mModel.updateDeputyUnitList(RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(data)))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.SAVE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.SAVE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -240,8 +237,8 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -240,8 +237,8 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
} }
} }
DeputyUnitBean unitBean = new DeputyUnitBean(); DeputyUnitBean unitBean = new DeputyUnitBean();
unitBean.setBrandId(PurchaseConstant.getBrandId()); unitBean.setBrandId(AppConstant.getBrandId());
unitBean.setRestaurantId(PurchaseConstant.getRestaurantId()); unitBean.setRestaurantId(AppConstant.getRestaurantId());
unitBean.setPurchaseFoodId(foodId); unitBean.setPurchaseFoodId(foodId);
deputyUnitBeans.add(unitBean); deputyUnitBeans.add(unitBean);
mRootView.loadDeputyUnitAdapter(deputyUnitBeans); mRootView.loadDeputyUnitAdapter(deputyUnitBeans);
...@@ -263,14 +260,14 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -263,14 +260,14 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
try { try {
jsonObject.put("content", content); jsonObject.put("content", content);
jsonObject.put("brandId", PurchaseConstant.getBrandId() + ""); jsonObject.put("brandId", AppConstant.getBrandId() + "");
jsonObject.put("restaurantId", PurchaseConstant.getRestaurantId() + ""); jsonObject.put("restaurantId", AppConstant.getRestaurantId() + "");
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }
mModel.addBasicUnit(RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())) mModel.addBasicUnit(RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.SAVE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.SAVE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -298,7 +295,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -298,7 +295,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
public void deleteUnitKey(int id, int position){ public void deleteUnitKey(int id, int position){
mModel.deleteUnitKey(id) mModel.deleteUnitKey(id)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.SAVE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.SAVE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -311,7 +308,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -311,7 +308,7 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
} else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
} }
} }
}); });
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/InflowWaterPresenter.java
...@@ -71,7 +71,7 @@ public class InflowWaterPresenter extends BasePresenter<InflowWaterContract.Mode ...@@ -71,7 +71,7 @@ public class InflowWaterPresenter extends BasePresenter<InflowWaterContract.Mode
map.put("consumeOrderId", warehouseDetailsBean.getPurchaseConsumeNoId()); map.put("consumeOrderId", warehouseDetailsBean.getPurchaseConsumeNoId());
mModel.getOutStockDetailsNumber(map) mModel.getOutStockDetailsNumber(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstans.GET_INFO_LOADING))
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewFoodIngredientsPresenter.java
...@@ -7,6 +7,7 @@ import android.text.InputType; ...@@ -7,6 +7,7 @@ import android.text.InputType;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
...@@ -163,11 +164,11 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -163,11 +164,11 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
public void getIngredientsDetails(int ingredientId) { public void getIngredientsDetails(int ingredientId) {
Map<String, Object> map = new HashMap<>(3); Map<String, Object> map = new HashMap<>(3);
map.put("id", ingredientId); map.put("id", ingredientId);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
mModel.getFoodIngredientsDetails(map) mModel.getFoodIngredientsDetails(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -175,7 +176,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -175,7 +176,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
.subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
@Override @Override
public void onNext(BaseResult baseResult) { public void onNext(BaseResult baseResult) {
if (ResultUtils.isSuccess(baseResult, PurchaseConstant.NULL_INFO_ERROR, mRootView)) { if (ResultUtils.isSuccess(baseResult, AppConstant.NULL_INFO_ERROR, mRootView)) {
PurchaseFoodBean purchaseFoodBean = GsonUtils.GsonToBean(baseResult.getData(), PurchaseFoodBean.class); PurchaseFoodBean purchaseFoodBean = GsonUtils.GsonToBean(baseResult.getData(), PurchaseFoodBean.class);
if (purchaseFoodBean != null) { if (purchaseFoodBean != null) {
purchaseFoodBean.setId(ingredientId); purchaseFoodBean.setId(ingredientId);
...@@ -189,7 +190,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -189,7 +190,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
setPurchaseFoodBean(purchaseFoodBean); setPurchaseFoodBean(purchaseFoodBean);
mRootView.initAdapter(); mRootView.initAdapter();
} else { } else {
mRootView.showMessage(PurchaseConstant.NULL_INFO_ERROR); mRootView.showMessage(AppConstant.NULL_INFO_ERROR);
} }
} }
} }
...@@ -318,8 +319,8 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -318,8 +319,8 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
infoMultiBeans.get(basicUnitIndex).setShowValue(basicUnitName); infoMultiBeans.get(basicUnitIndex).setShowValue(basicUnitName);
if (deputyUnitBeans != null) { if (deputyUnitBeans != null) {
for (DeputyUnitBean deputyUnitBean : deputyUnitBeans) { for (DeputyUnitBean deputyUnitBean : deputyUnitBeans) {
deputyUnitBean.setRestaurantId(PurchaseConstant.getRestaurantId()); deputyUnitBean.setRestaurantId(AppConstant.getRestaurantId());
deputyUnitBean.setBrandId(PurchaseConstant.getBrandId()); deputyUnitBean.setBrandId(AppConstant.getBrandId());
} }
} }
this.deputyUnitBeans = deputyUnitBeans; this.deputyUnitBeans = deputyUnitBeans;
...@@ -393,7 +394,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -393,7 +394,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseFoodBean)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseFoodBean));
mModel.addFood(requestBody) mModel.addFood(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.SAVE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.SAVE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -402,12 +403,12 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -402,12 +403,12 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
@Override @Override
public void onNext(BaseResult baseResult) { public void onNext(BaseResult baseResult) {
if (baseResult.isSuccess()) { if (baseResult.isSuccess()) {
mRootView.showMessage(PurchaseConstant.SAVE_SUCCESS); mRootView.showMessage(AppConstant.SAVE_SUCCESS);
mRootView.updateFoodInfoSuccess(purchaseFoodBean.getSupplierName(), purchaseFoodBean.getFoodCategoryName()); mRootView.updateFoodInfoSuccess(purchaseFoodBean.getSupplierName(), purchaseFoodBean.getFoodCategoryName());
} else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.SAVE_FAIL); mRootView.showMessage(AppConstant.SAVE_FAIL);
} }
} }
}); });
...@@ -425,7 +426,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -425,7 +426,7 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseFoodBean)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseFoodBean));
mModel.updateFood(requestBody) mModel.updateFood(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.UPDATE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.UPDATE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -434,14 +435,14 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -434,14 +435,14 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
@Override @Override
public void onNext(BaseResult baseResult) { public void onNext(BaseResult baseResult) {
if (baseResult.isSuccess()) { if (baseResult.isSuccess()) {
mRootView.showMessage(PurchaseConstant.UPDATE_SUCCESS); mRootView.showMessage(AppConstant.UPDATE_SUCCESS);
mRootView.updateFoodInfoSuccess(purchaseFoodBean.getSupplierName(), purchaseFoodBean.getFoodCategoryName()); mRootView.updateFoodInfoSuccess(purchaseFoodBean.getSupplierName(), purchaseFoodBean.getFoodCategoryName());
purchaseFoodBean.setSupplierId(supplierId); purchaseFoodBean.setSupplierId(supplierId);
SupplyShoppingCart.getInstance().replaceFood(purchaseFoodBean); SupplyShoppingCart.getInstance().replaceFood(purchaseFoodBean);
} else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.UPDATE_FAIL); mRootView.showMessage(AppConstant.UPDATE_FAIL);
} }
} }
}); });
...@@ -570,9 +571,9 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -570,9 +571,9 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
purchaseFoodBean.setFoodUnits(deputyUnitBeans); purchaseFoodBean.setFoodUnits(deputyUnitBeans);
} }
//品牌id //品牌id
purchaseFoodBean.setBrandId(PurchaseConstant.getBrandId()); purchaseFoodBean.setBrandId(AppConstant.getBrandId());
//餐廳id //餐廳id
purchaseFoodBean.setRestaurantId(PurchaseConstant.getRestaurantId()); purchaseFoodBean.setRestaurantId(AppConstant.getRestaurantId());
return purchaseFoodBean; return purchaseFoodBean;
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewFoodUnitPresenter.java
...@@ -3,11 +3,11 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,11 +3,11 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.ui.adapter.bean.InfoMultiBean; import com.gingersoft.gsa.cloud.ui.adapter.bean.InfoMultiBean;
import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean; import com.gingersoft.supply_chain.mvp.bean.MeasurementUnitBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.contract.NewFoodUnitContract; import com.gingersoft.supply_chain.mvp.contract.NewFoodUnitContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
...@@ -129,8 +129,8 @@ public class NewFoodUnitPresenter extends BasePresenter<NewFoodUnitContract.Mode ...@@ -129,8 +129,8 @@ public class NewFoodUnitPresenter extends BasePresenter<NewFoodUnitContract.Mode
if (foodUnit == null) { if (foodUnit == null) {
foodUnit = new MeasurementUnitBean.DataBean.Unit(); foodUnit = new MeasurementUnitBean.DataBean.Unit();
} }
foodUnit.setBrandId(PurchaseConstant.getBrandId()); foodUnit.setBrandId(AppConstant.getBrandId());
foodUnit.setRestaurantId(PurchaseConstant.getRestaurantId()); foodUnit.setRestaurantId(AppConstant.getRestaurantId());
List<InfoMultiBean> units = infoMultiBeans.get(0).getInfoMultiBeans(); List<InfoMultiBean> units = infoMultiBeans.get(0).getInfoMultiBeans();
for (int i = 0; i < units.size(); i++) { for (int i = 0; i < units.size(); i++) {
if (units.get(i).isChecked()) { if (units.get(i).isChecked()) {
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewSupplierPresenter.java
...@@ -9,7 +9,7 @@ import android.view.inputmethod.EditorInfo; ...@@ -9,7 +9,7 @@ import android.view.inputmethod.EditorInfo;
import android.widget.EditText; import android.widget.EditText;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.MatchUtils; import com.gingersoft.gsa.cloud.common.utils.MatchUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; 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.inputFilter.InputFilterUtils;
...@@ -21,7 +21,6 @@ import com.gingersoft.gsa.cloud.ui.adapter.multi.InfoMultiAdapter; ...@@ -21,7 +21,6 @@ import com.gingersoft.gsa.cloud.ui.adapter.multi.InfoMultiAdapter;
import com.gingersoft.gsa.cloud.ui.adapter.multi.RemarkProvider; import com.gingersoft.gsa.cloud.ui.adapter.multi.RemarkProvider;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart; import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart;
import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract; import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
...@@ -234,8 +233,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode ...@@ -234,8 +233,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
*/ */
public void getSupplierInfo(EditText editText, String supplierName) { public void getSupplierInfo(EditText editText, String supplierName) {
Map<String, Object> map = new HashMap<>(3); Map<String, Object> map = new HashMap<>(3);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
map.put("supplierName", supplierName); map.put("supplierName", supplierName);
mModel.getSupplierInfo(map) mModel.getSupplierInfo(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
...@@ -312,7 +311,7 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode ...@@ -312,7 +311,7 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
public void deleteSupplier(int supplierId) { public void deleteSupplier(int supplierId) {
mModel.deleteSupplier(supplierId) mModel.deleteSupplier(supplierId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.SAVE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.SAVE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -328,7 +327,7 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode ...@@ -328,7 +327,7 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
} else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) {
mRootView.showMessage(info.getErrMsg()); mRootView.showMessage(info.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.SAVE_FAIL); mRootView.showMessage(AppConstant.SAVE_FAIL);
} }
} }
} }
...@@ -514,8 +513,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode ...@@ -514,8 +513,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
//地址 //地址
supplierInfoBean.setAddress(TextUtil.getNotNullStrAndTrim(infoMultiBeans.get(addressIndex).getShowValue())); supplierInfoBean.setAddress(TextUtil.getNotNullStrAndTrim(infoMultiBeans.get(addressIndex).getShowValue()));
//餐廳信息 //餐廳信息
supplierInfoBean.setRestaurantId(PurchaseConstant.getRestaurantId()); supplierInfoBean.setRestaurantId(AppConstant.getRestaurantId());
supplierInfoBean.setBrandId(PurchaseConstant.getBrandId()); supplierInfoBean.setBrandId(AppConstant.getBrandId());
//最低採購金額 //最低採購金額
String minimumAmount = infoMultiBeans.get(lowPurchaseAmount).getShowValue(); String minimumAmount = infoMultiBeans.get(lowPurchaseAmount).getShowValue();
if (TextUtil.isNotEmptyOrNullOrUndefined(minimumAmount)) { if (TextUtil.isNotEmptyOrNullOrUndefined(minimumAmount)) {
...@@ -543,11 +542,11 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode ...@@ -543,11 +542,11 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
mRootView.showMessage("請輸入聯繫人地址"); mRootView.showMessage("請輸入聯繫人地址");
return null; return null;
} }
if (telephone.length() != AppConstans.MOBILE_TYPE_HK_LENGTH && telephone.length() != AppConstans.MOBILE_TYPE_CH_LENGTH) { if (telephone.length() != AppConstant.MOBILE_TYPE_HK_LENGTH && telephone.length() != AppConstant.MOBILE_TYPE_CH_LENGTH) {
mRootView.showMessage("聯繫人電話格式不正確 "); mRootView.showMessage("聯繫人電話格式不正確 ");
return null; return null;
} }
if (telephone.length() == AppConstans.MOBILE_TYPE_CH_LENGTH) { if (telephone.length() == AppConstant.MOBILE_TYPE_CH_LENGTH) {
if (!MatchUtils.checkMobile(telephone)) { if (!MatchUtils.checkMobile(telephone)) {
mRootView.showMessage("聯繫人電話格式不正確"); mRootView.showMessage("聯繫人電話格式不正確");
return null; return null;
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/OrderDetailsPresenter.java
...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
...@@ -44,12 +45,6 @@ import okhttp3.MediaType; ...@@ -44,12 +45,6 @@ import okhttp3.MediaType;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.GET_INFO_ERROR;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.GET_INFO_LOADING;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.NULL_INFO_ERROR;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.SAVE_FAIL;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.SAVE_LOADING;
/** /**
* ================================================ * ================================================
...@@ -300,16 +295,16 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -300,16 +295,16 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
return; return;
} }
Map<String, Object> map = new HashMap<>(3); Map<String, Object> map = new HashMap<>(3);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
for (PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean item : data) { for (PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean item : data) {
stringBuilder.append(item.getPurchaseFoodId()).append(PurchaseConstant.COMMA_SEPARATED); stringBuilder.append(item.getPurchaseFoodId()).append(AppConstant.COMMA_SEPARATED);
} }
map.put("ids", stringBuilder.substring(0, stringBuilder.length() - 1)); map.put("ids", stringBuilder.substring(0, stringBuilder.length() - 1));
mModel.buyAgainByFoodIds(map) mModel.buyAgainByFoodIds(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
...@@ -358,8 +353,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -358,8 +353,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
String substring = files.substring(0, files.length()); String substring = files.substring(0, files.length());
purchaseWarehousingOrder.setFiles(substring); purchaseWarehousingOrder.setFiles(substring);
} }
purchaseWarehousingOrder.setRestaurantId(PurchaseConstant.getRestaurantId()); purchaseWarehousingOrder.setRestaurantId(AppConstant.getRestaurantId());
purchaseWarehousingOrder.setBrandId(PurchaseConstant.getBrandId()); purchaseWarehousingOrder.setBrandId(AppConstant.getBrandId());
purchaseWarehousingOrder.setRemarks(remark); purchaseWarehousingOrder.setRemarks(remark);
purchaseWarehousingOrder.setSupplierId(supplierId); purchaseWarehousingOrder.setSupplierId(supplierId);
purchaseWarehousingOrder.setTotalPrice(totalAmount); purchaseWarehousingOrder.setTotalPrice(totalAmount);
...@@ -403,8 +398,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -403,8 +398,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
//不是待收貨狀態才設置id，因為如果已經收過貨才有id //不是待收貨狀態才設置id，因為如果已經收過貨才有id
wareHousingUnitBean.setId(deputyUnitBean.getId()); wareHousingUnitBean.setId(deputyUnitBean.getId());
} }
wareHousingUnitBean.setBrandId(PurchaseConstant.getBrandId()); wareHousingUnitBean.setBrandId(AppConstant.getBrandId());
wareHousingUnitBean.setRestaurantId(PurchaseConstant.getRestaurantId()); wareHousingUnitBean.setRestaurantId(AppConstant.getRestaurantId());
purchaseWarehousingOrderDetail.setPurchaseWarehousingUnit(wareHousingUnitBean); purchaseWarehousingOrderDetail.setPurchaseWarehousingUnit(wareHousingUnitBean);
//sn碼 //sn碼
List<PurchaseFoodEncodeSn> snList = null; List<PurchaseFoodEncodeSn> snList = null;
...@@ -435,7 +430,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -435,7 +430,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
public void deleteOrder() { public void deleteOrder() {
mModel.deleteOrder(orderId) mModel.deleteOrder(orderId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.DELETE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.DELETE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -497,7 +492,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -497,7 +492,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
map.put("encodeSnNo", encodeSnNo); map.put("encodeSnNo", encodeSnNo);
mModel.deleteSnCode(map) mModel.deleteSnCode(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.DELETE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.DELETE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -506,7 +501,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -506,7 +501,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
@Override @Override
public void onNext(@NonNull BaseResult info) { public void onNext(@NonNull BaseResult info) {
if (info.isSuccess()) { if (info.isSuccess()) {
mRootView.showMessage(PurchaseConstant.DELETE_SUCCESS); mRootView.showMessage(AppConstant.DELETE_SUCCESS);
} }
} }
...@@ -519,7 +514,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -519,7 +514,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
public void querySnCodes(int position, PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean infoVosBean, boolean singerFood) { public void querySnCodes(int position, PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean infoVosBean, boolean singerFood) {
mModel.querySnCodes(infoVosBean.getFoodNo(), infoVosBean.getOrderNo()) mModel.querySnCodes(infoVosBean.getFoodNo(), infoVosBean.getOrderNo())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.QUERY_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.QUERY_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/PurchaseListPresenter.java
...@@ -3,10 +3,10 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,10 +3,10 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderDetailsBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderDetailsBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderResultBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderResultBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.contract.PurchaseListContract; import com.gingersoft.supply_chain.mvp.contract.PurchaseListContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
...@@ -27,8 +27,6 @@ import io.reactivex.schedulers.Schedulers; ...@@ -27,8 +27,6 @@ import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber; import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import static com.gingersoft.supply_chain.mvp.content.PurchaseConstant.PAGE_SIZE;
/** /**
* Description:採購列表 * Description:採購列表
...@@ -60,9 +58,9 @@ public class PurchaseListPresenter extends BasePresenter<PurchaseListContract.Mo ...@@ -60,9 +58,9 @@ public class PurchaseListPresenter extends BasePresenter<PurchaseListContract.Mo
public void getOrderList(String orderNo, int orderStatus, int pageIndex) { public void getOrderList(String orderNo, int orderStatus, int pageIndex) {
Map<String, Object> map = new HashMap<>(6); Map<String, Object> map = new HashMap<>(6);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addPageSize(map); AppConstant.addPageSize(map);
if (TextUtil.isNotEmptyOrNullOrUndefined(orderNo)) { if (TextUtil.isNotEmptyOrNullOrUndefined(orderNo)) {
map.put("orderNo", orderNo); map.put("orderNo", orderNo);
} }
...@@ -77,10 +75,10 @@ public class PurchaseListPresenter extends BasePresenter<PurchaseListContract.Mo ...@@ -77,10 +75,10 @@ public class PurchaseListPresenter extends BasePresenter<PurchaseListContract.Mo
map.put("status", orderStatus); map.put("status", orderStatus);
} }
} }
map.put("pageIndex", pageIndex * PAGE_SIZE); map.put("pageIndex", pageIndex * AppConstant.PAGE_SIZE);
mModel.getOrderList(map) mModel.getOrderList(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -115,7 +113,7 @@ public class PurchaseListPresenter extends BasePresenter<PurchaseListContract.Mo ...@@ -115,7 +113,7 @@ public class PurchaseListPresenter extends BasePresenter<PurchaseListContract.Mo
public void deleteOrder(int position, int orderId) { public void deleteOrder(int position, int orderId) {
mModel.deleteOrder(orderId) mModel.deleteOrder(orderId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.DELETE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.DELETE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/SnCodeListPresenter.java
...@@ -3,28 +3,27 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,28 +3,27 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodEncodeSn; import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodEncodeSn;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant; import com.gingersoft.supply_chain.mvp.contract.SnCodeListContract;
import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.utils.RxLifecycleUtils;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber; import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import javax.inject.Inject;
import com.gingersoft.supply_chain.mvp.contract.SnCodeListContract;
import com.jess.arms.utils.RxLifecycleUtils;
import java.util.HashMap;
import java.util.Map;
/** /**
* ================================================ * ================================================
...@@ -79,7 +78,7 @@ public class SnCodeListPresenter extends BasePresenter<SnCodeListContract.Model, ...@@ -79,7 +78,7 @@ public class SnCodeListPresenter extends BasePresenter<SnCodeListContract.Model,
} }
mModel.querySnCodeList(map) mModel.querySnCodeList(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.QUERY_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.QUERY_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -100,7 +99,7 @@ public class SnCodeListPresenter extends BasePresenter<SnCodeListContract.Model, ...@@ -100,7 +99,7 @@ public class SnCodeListPresenter extends BasePresenter<SnCodeListContract.Model,
public void queryInStockSnCodes(String foodNo) { public void queryInStockSnCodes(String foodNo) {
mModel.queryInStockSnCodes(foodNo) mModel.queryInStockSnCodes(foodNo)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.QUERY_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.QUERY_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/StorageListPresenter.java
...@@ -3,10 +3,10 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,10 +3,10 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.WareHousingOrderBean; import com.gingersoft.supply_chain.mvp.bean.WareHousingOrderBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.contract.StorageListContract; import com.gingersoft.supply_chain.mvp.contract.StorageListContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
...@@ -70,8 +70,8 @@ public class StorageListPresenter extends BasePresenter<StorageListContract.Mode ...@@ -70,8 +70,8 @@ public class StorageListPresenter extends BasePresenter<StorageListContract.Mode
Map<String, Object> map = new HashMap<>(6); Map<String, Object> map = new HashMap<>(6);
map.put("pageSize", 10); map.put("pageSize", 10);
map.put("pageIndex", pageIndex); map.put("pageIndex", pageIndex);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
map.put("status", status); map.put("status", status);
if (TextUtil.isNotEmptyOrNullOrUndefined(orderNo)) { if (TextUtil.isNotEmptyOrNullOrUndefined(orderNo)) {
map.put("orderNo", orderNo); map.put("orderNo", orderNo);
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/SupplierListPresenter.java
...@@ -3,10 +3,10 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,10 +3,10 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.bean.SupplierResultBean; import com.gingersoft.supply_chain.mvp.bean.SupplierResultBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart; import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart;
import com.gingersoft.supply_chain.mvp.contract.SupplierListContract; import com.gingersoft.supply_chain.mvp.contract.SupplierListContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
...@@ -84,10 +84,10 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo ...@@ -84,10 +84,10 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo
*/ */
public void getSupplierList(String content, int pageIndex, boolean needGetIndex) { public void getSupplierList(String content, int pageIndex, boolean needGetIndex) {
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", PurchaseConstant.PAGE_SIZE); map.put("pageSize", AppConstant.PAGE_SIZE);
map.put("pageIndex", pageIndex * PurchaseConstant.PAGE_SIZE); map.put("pageIndex", pageIndex * AppConstant.PAGE_SIZE);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
if (!TextUtil.isEmptyOrNullOrUndefined(content)) { if (!TextUtil.isEmptyOrNullOrUndefined(content)) {
map.put("content", content); map.put("content", content);
} }
...@@ -168,7 +168,7 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo ...@@ -168,7 +168,7 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo
public void deleteSupplier(int id, int position) { public void deleteSupplier(int id, int position) {
mModel.deleteSupplier(id) mModel.deleteSupplier(id)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.DELETE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.DELETE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -184,7 +184,7 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo ...@@ -184,7 +184,7 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo
} else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) {
mRootView.showMessage(info.getErrMsg()); mRootView.showMessage(info.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.DELETE_FAIL); mRootView.showMessage(AppConstant.DELETE_FAIL);
} }
} }
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WareHouseListPresenter.java
...@@ -2,11 +2,11 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -2,11 +2,11 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.PurchaseWarehousingOrderDetailsVO; import com.gingersoft.supply_chain.mvp.bean.PurchaseWarehousingOrderDetailsVO;
import com.gingersoft.supply_chain.mvp.bean.WareHouseListBean; import com.gingersoft.supply_chain.mvp.bean.WareHouseListBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
...@@ -114,13 +114,13 @@ public class WareHouseListPresenter extends BasePresenter<WareHouseListContract. ...@@ -114,13 +114,13 @@ public class WareHouseListPresenter extends BasePresenter<WareHouseListContract.
if (TextUtil.isNotEmptyOrNullOrUndefined(foodName)) { if (TextUtil.isNotEmptyOrNullOrUndefined(foodName)) {
map.put("name", foodName); map.put("name", foodName);
} }
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
map.put("pageSize", 30); map.put("pageSize", 30);
map.put("pageIndex", pageIndex * 30); map.put("pageIndex", pageIndex * 30);
mModel.getWarehousing(map) mModel.getWarehousing(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -138,7 +138,7 @@ public class WareHouseListPresenter extends BasePresenter<WareHouseListContract. ...@@ -138,7 +138,7 @@ public class WareHouseListPresenter extends BasePresenter<WareHouseListContract.
mRootView.showMessage(wareHouseListBean.getErrMsg()); mRootView.showMessage(wareHouseListBean.getErrMsg());
mRootView.loadFail(); mRootView.loadFail();
} else { } else {
mRootView.showMessage(PurchaseConstant.GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
mRootView.loadFail(); mRootView.loadFail();
} }
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WarehouseDetailsPresenter.java
...@@ -4,6 +4,7 @@ import android.app.Application; ...@@ -4,6 +4,7 @@ import android.app.Application;
import android.view.View; import android.view.View;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -13,7 +14,6 @@ import com.gingersoft.supply_chain.mvp.bean.NoIsFoodSnTipBean; ...@@ -13,7 +14,6 @@ import com.gingersoft.supply_chain.mvp.bean.NoIsFoodSnTipBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseConsumeSnBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseConsumeSnBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseWarehousingOrderDetailsVO; import com.gingersoft.supply_chain.mvp.bean.PurchaseWarehousingOrderDetailsVO;
import com.gingersoft.supply_chain.mvp.bean.WarehouseDetailsBean; import com.gingersoft.supply_chain.mvp.bean.WarehouseDetailsBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.contract.WarehouseDetailsContract; import com.gingersoft.supply_chain.mvp.contract.WarehouseDetailsContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
...@@ -81,12 +81,12 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -81,12 +81,12 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
*/ */
public void getWarehousingOrderDetails(String foodNo) { public void getWarehousingOrderDetails(String foodNo) {
Map<String, Object> map = new HashMap<>(4); Map<String, Object> map = new HashMap<>(4);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
map.put("foodNo", foodNo); map.put("foodNo", foodNo);
mModel.getWarehousingOrderDetails(map) mModel.getWarehousingOrderDetails(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -100,7 +100,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -100,7 +100,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
} else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
} }
} }
}); });
...@@ -113,12 +113,12 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -113,12 +113,12 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
*/ */
public void getOutStockDetails(String foodNo) { public void getOutStockDetails(String foodNo) {
Map<String, Object> map = new HashMap<>(4); Map<String, Object> map = new HashMap<>(4);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
map.put("foodNo", foodNo); map.put("foodNo", foodNo);
mModel.getOutStockDetails(map) mModel.getOutStockDetails(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -132,7 +132,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -132,7 +132,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
} else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
} }
} }
}); });
...@@ -144,7 +144,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -144,7 +144,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
public void getWarehouseInventoryReason() { public void getWarehouseInventoryReason() {
mModel.getWarehouseInventoryReason() mModel.getWarehouseInventoryReason()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -158,7 +158,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -158,7 +158,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
} else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.GET_INFO_ERROR); mRootView.showMessage(AppConstant.GET_INFO_ERROR);
} }
} }
}); });
...@@ -174,8 +174,8 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -174,8 +174,8 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
*/ */
public void consumeWareHousing(PurchaseWarehousingOrderDetailsVO purchaseWarehousingOrderDetailsVO, int consumeQuantity, ConsumeReasonBean consumeReasonBean, String remarks, List<String> snCodes, boolean whetherPrint) { public void consumeWareHousing(PurchaseWarehousingOrderDetailsVO purchaseWarehousingOrderDetailsVO, int consumeQuantity, ConsumeReasonBean consumeReasonBean, String remarks, List<String> snCodes, boolean whetherPrint) {
PurchaseConsumeSnBean purchaseConsumeSnBean = new PurchaseConsumeSnBean(); PurchaseConsumeSnBean purchaseConsumeSnBean = new PurchaseConsumeSnBean();
purchaseConsumeSnBean.brandId = PurchaseConstant.getBrandId(); purchaseConsumeSnBean.brandId = AppConstant.getBrandId();
purchaseConsumeSnBean.restaurantId = PurchaseConstant.getRestaurantId(); purchaseConsumeSnBean.restaurantId = AppConstant.getRestaurantId();
purchaseConsumeSnBean.foodNo = purchaseWarehousingOrderDetailsVO.getFoodNo(); purchaseConsumeSnBean.foodNo = purchaseWarehousingOrderDetailsVO.getFoodNo();
purchaseConsumeSnBean.purchaseConsumeReasonId = consumeReasonBean.getId(); purchaseConsumeSnBean.purchaseConsumeReasonId = consumeReasonBean.getId();
purchaseConsumeSnBean.remarks = remarks; purchaseConsumeSnBean.remarks = remarks;
...@@ -188,7 +188,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -188,7 +188,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseConsumeSnBean)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseConsumeSnBean));
mModel.consumeWareHousing(requestBody) mModel.consumeWareHousing(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.UPDATE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.UPDATE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -216,7 +216,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -216,7 +216,7 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
} }
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.UPDATE_FAIL); mRootView.showMessage(AppConstant.UPDATE_FAIL);
} }
} }
...@@ -228,12 +228,12 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon ...@@ -228,12 +228,12 @@ public class WarehouseDetailsPresenter extends BasePresenter<WarehouseDetailsCon
*/ */
public void getWarehousingNum(String foodNo) { public void getWarehousingNum(String foodNo) {
Map<String, Object> map = new HashMap<>(3); Map<String, Object> map = new HashMap<>(3);
PurchaseConstant.addBrandId(map); AppConstant.addBrandId(map);
PurchaseConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
map.put("foodNo", foodNo); map.put("foodNo", foodNo);
mModel.getWarehousingNum(map) mModel.getWarehousingNum(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.QUERY_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.QUERY_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/WarehousingInventoryPresenter.java
...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -83,8 +84,8 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve ...@@ -83,8 +84,8 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
public PurchaseConsumeSnBean getPurchaseConsumeSnBean(String foodNo, int consumeQuantity, List<PurchaseFoodEncodeSn> snCodes) { public PurchaseConsumeSnBean getPurchaseConsumeSnBean(String foodNo, int consumeQuantity, List<PurchaseFoodEncodeSn> snCodes) {
PurchaseConsumeSnBean purchaseConsumeSnBean = new PurchaseConsumeSnBean(); PurchaseConsumeSnBean purchaseConsumeSnBean = new PurchaseConsumeSnBean();
purchaseConsumeSnBean.brandId = PurchaseConstant.getBrandId(); purchaseConsumeSnBean.brandId = AppConstant.getBrandId();
purchaseConsumeSnBean.restaurantId = PurchaseConstant.getRestaurantId(); purchaseConsumeSnBean.restaurantId = AppConstant.getRestaurantId();
purchaseConsumeSnBean.foodNo = foodNo; purchaseConsumeSnBean.foodNo = foodNo;
purchaseConsumeSnBean.consumeQuantity = consumeQuantity; purchaseConsumeSnBean.consumeQuantity = consumeQuantity;
purchaseConsumeSnBean.purchaseConsumeReasonId = PurchaseConstant.INVENTORY_CONSUME_ID; purchaseConsumeSnBean.purchaseConsumeReasonId = PurchaseConstant.INVENTORY_CONSUME_ID;
...@@ -104,7 +105,7 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve ...@@ -104,7 +105,7 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseConsumeSnBean)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(purchaseConsumeSnBean));
mModel.wareHousingInventory(requestBody) mModel.wareHousingInventory(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.SAVE_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.SAVE_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -114,12 +115,12 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve ...@@ -114,12 +115,12 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
public void onNext(BaseResult baseResult) { public void onNext(BaseResult baseResult) {
if (baseResult != null && baseResult.isSuccess()) { if (baseResult != null && baseResult.isSuccess()) {
//消耗完之後，關閉頁面 //消耗完之後，關閉頁面
mRootView.showMessage(PurchaseConstant.SAVE_SUCCESS); mRootView.showMessage(AppConstant.SAVE_SUCCESS);
mRootView.updateSuccess(purchaseConsumeSnBean.consumeQuantity); mRootView.updateSuccess(purchaseConsumeSnBean.consumeQuantity);
} else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.SAVE_FAIL); mRootView.showMessage(AppConstant.SAVE_FAIL);
} }
} }
}); });
...@@ -131,11 +132,11 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve ...@@ -131,11 +132,11 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
public void getWarehousingRecord(String foodNo, int pageIndex) { public void getWarehousingRecord(String foodNo, int pageIndex) {
Map<String, Object> map = new HashMap<>(3); Map<String, Object> map = new HashMap<>(3);
map.put("foodNo", foodNo); map.put("foodNo", foodNo);
PurchaseConstant.addPageSize(map); AppConstant.addPageSize(map);
map.put("pageIndex", pageIndex * PurchaseConstant.PAGE_SIZE); map.put("pageIndex", pageIndex * AppConstant.PAGE_SIZE);
mModel.getWarehousingRecord(map) mModel.getWarehousingRecord(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(PurchaseConstant.QUERY_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(AppConstant.QUERY_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
...@@ -156,7 +157,7 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve ...@@ -156,7 +157,7 @@ public class WarehousingInventoryPresenter extends BasePresenter<WarehousingInve
} else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) { } else if (baseResult != null && TextUtil.isNotEmptyOrNullOrUndefined(baseResult.getErrMsg())) {
mRootView.showMessage(baseResult.getErrMsg()); mRootView.showMessage(baseResult.getErrMsg());
} else { } else {
mRootView.showMessage(PurchaseConstant.SAVE_FAIL); mRootView.showMessage(AppConstant.SAVE_FAIL);
} }
} }
}); });
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/activity/SupplyChainMainActivity.java
...@@ -12,15 +12,9 @@ import android.widget.EditText; ...@@ -12,15 +12,9 @@ import android.widget.EditText;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.component.ComponentAction;
import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.order.order.TakeawayOrder;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.di.component.DaggerSupplyChainMainComponent; import com.gingersoft.supply_chain.di.component.DaggerSupplyChainMainComponent;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart; import com.gingersoft.supply_chain.mvp.content.SupplyShoppingCart;
import com.gingersoft.supply_chain.mvp.contract.SupplyChainMainContract; import com.gingersoft.supply_chain.mvp.contract.SupplyChainMainContract;
import com.gingersoft.supply_chain.mvp.presenter.SupplyChainMainPresenter; import com.gingersoft.supply_chain.mvp.presenter.SupplyChainMainPresenter;
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/binder/SnInRecordDetailsBinder.java
...@@ -28,7 +28,7 @@ public class SnInRecordDetailsBinder extends QuickItemBinder<SnInOutBoundRecordD ...@@ -28,7 +28,7 @@ public class SnInRecordDetailsBinder extends QuickItemBinder<SnInOutBoundRecordD
Context context = viewHolder.itemView.getContext(); Context context = viewHolder.itemView.getContext();
viewHolder.setText(R.id.iv_inout_bound_details_type, String.format(context.getString(R.string.str_format_in_warehousing_type), item.getStorageType())); viewHolder.setText(R.id.iv_inout_bound_details_type, String.format(context.getString(R.string.str_format_in_warehousing_type), item.getStorageType()));
viewHolder.setText(R.id.iv_inout_bound_details_member, item.getUserName()); viewHolder.setText(R.id.iv_inout_bound_details_member, item.getUserName());
viewHolder.setText(R.id.iv_inout_bound_details_time, String.format(context.getString(R.string.str_format_time), TimeUtils.StampToData(TimeUtils.DEFAULT_DATE_FORMAT, item.getCreateTime()))); viewHolder.setText(R.id.iv_inout_bound_details_time, String.format(context.getString(R.string.str_format_time), TimeUtils.stampToData(TimeUtils.DEFAULT_DATE_FORMAT, item.getCreateTime())));
viewHolder.setText(R.id.iv_inout_bound_details_order_no, String.format(context.getString(R.string.str_format_order_no), item.getOrderNo())); viewHolder.setText(R.id.iv_inout_bound_details_order_no, String.format(context.getString(R.string.str_format_order_no), item.getOrderNo()));
viewHolder.setText(R.id.iv_inout_bound_details_remarks, String.format(context.getString(R.string.str_format_remark_colon), item.getRemarks())); viewHolder.setText(R.id.iv_inout_bound_details_remarks, String.format(context.getString(R.string.str_format_remark_colon), item.getRemarks()));
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/binder/SnOutRecordDetailsBinder.java
...@@ -28,7 +28,7 @@ public class SnOutRecordDetailsBinder extends QuickItemBinder<SnInOutBoundRecord ...@@ -28,7 +28,7 @@ public class SnOutRecordDetailsBinder extends QuickItemBinder<SnInOutBoundRecord
Context context = viewHolder.itemView.getContext(); Context context = viewHolder.itemView.getContext();
viewHolder.setText(R.id.iv_inout_bound_details_type, String.format(context.getString(R.string.str_format_out_warehousing_type), item.getConsumeType())); viewHolder.setText(R.id.iv_inout_bound_details_type, String.format(context.getString(R.string.str_format_out_warehousing_type), item.getConsumeType()));
viewHolder.setText(R.id.iv_inout_bound_details_member, item.getUserName()); viewHolder.setText(R.id.iv_inout_bound_details_member, item.getUserName());
viewHolder.setText(R.id.iv_inout_bound_details_time, String.format(context.getString(R.string.str_format_time), TimeUtils.StampToData(TimeUtils.DEFAULT_DATE_FORMAT, item.getCreateTime()))); viewHolder.setText(R.id.iv_inout_bound_details_time, String.format(context.getString(R.string.str_format_time), TimeUtils.stampToData(TimeUtils.DEFAULT_DATE_FORMAT, item.getCreateTime())));
viewHolder.setText(R.id.iv_inout_bound_details_order_no, String.format(context.getString(R.string.str_format_order_no), item.getOrderNo())); viewHolder.setText(R.id.iv_inout_bound_details_order_no, String.format(context.getString(R.string.str_format_order_no), item.getOrderNo()));
viewHolder.setText(R.id.iv_inout_bound_details_remarks, String.format(context.getString(R.string.str_format_remark_colon), item.getRemarks())); viewHolder.setText(R.id.iv_inout_bound_details_remarks, String.format(context.getString(R.string.str_format_remark_colon), item.getRemarks()));
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/widget/UpdateRestaurantInfoPop.java
package com.gingersoft.supply_chain.mvp.ui.widget; package com.gingersoft.supply_chain.mvp.ui.widget;
import android.content.Context; import android.content.Context;
import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo; 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.RestaurantInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2; import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import com.lxj.xpopup.impl.ConfirmPopupView; import com.lxj.xpopup.impl.ConfirmPopupView;
...@@ -57,8 +56,8 @@ public class UpdateRestaurantInfoPop extends ConfirmPopupView { ...@@ -57,8 +56,8 @@ public class UpdateRestaurantInfoPop extends ConfirmPopupView {
protected void onCreate() { protected void onCreate() {
super.onCreate(); super.onCreate();
ButterKnife.bind(this); ButterKnife.bind(this);
edBrandInput.setText(String.valueOf(PurchaseConstant.getBrandId())); edBrandInput.setText(String.valueOf(AppConstant.getBrandId()));
edRestaurantInput.setText(String.valueOf(PurchaseConstant.getRestaurantId())); edRestaurantInput.setText(String.valueOf(AppConstant.getRestaurantId()));
tvConfirm.setOnClickListener(v -> { tvConfirm.setOnClickListener(v -> {
RestaurantInfoManager.newInstance().setBrandInfo(new BrandInfo(Integer.parseInt(Objects.requireNonNull(edBrandInput.getText()).toString()), "")); RestaurantInfoManager.newInstance().setBrandInfo(new BrandInfo(Integer.parseInt(Objects.requireNonNull(edBrandInput.getText()).toString()), ""));
RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(Integer.parseInt(String.valueOf(edRestaurantInput.getText())), "", "")); RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(Integer.parseInt(String.valueOf(edRestaurantInput.getText())), "", ""));
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/widget/WarehousingFoodDetailsPopup.java
package com.gingersoft.supply_chain.mvp.ui.widget; package com.gingersoft.supply_chain.mvp.ui.widget;
import android.content.Context; import android.content.Context;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
...@@ -10,14 +9,10 @@ import androidx.annotation.NonNull; ...@@ -10,14 +9,10 @@ import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.glide.GlideUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.threadPool.ThreadPoolManager;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2; import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean;
import com.gingersoft.supply_chain.mvp.content.PurchaseConstant;
import com.gingersoft.supply_chain.mvp.ui.adapter.BuyIngredientsAdapter;
import com.lxj.xpopup.core.CenterPopupView; import com.lxj.xpopup.core.CenterPopupView;
import com.qmuiteam.qmui.widget.textview.QMUISpanTouchFixTextView; import com.qmuiteam.qmui.widget.textview.QMUISpanTouchFixTextView;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealFineAllContract.java
...@@ -48,9 +48,16 @@ public interface MealFineAllContract { ...@@ -48,9 +48,16 @@ public interface MealFineAllContract {
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存 //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel { interface Model extends IModel {
/**
* 訊息
* @return
*/
List<Modifier> queryDB_ModifierByModMsgAndVisibleQueryBuilder(); List<Modifier> queryDB_ModifierByModMsgAndVisibleQueryBuilder();
/**
* 口味
* @return
*/
List<Modifier> queryDB_ModifierByModModTasteVisibleQueryBuilder(); List<Modifier> queryDB_ModifierByModModTasteVisibleQueryBuilder();
List<Modifier> queryDB_ModifierByModModCommVisibleQueryBuilder(); List<Modifier> queryDB_ModifierByModModCommVisibleQueryBuilder();
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/mealstand/MealFineAllPresenter.java
...@@ -200,7 +200,7 @@ public class MealFineAllPresenter extends BasePresenter<MealFineAllContract.Mode ...@@ -200,7 +200,7 @@ public class MealFineAllPresenter extends BasePresenter<MealFineAllContract.Mode
mFineItemAllAdapter.notifyDataSetChanged(); mFineItemAllAdapter.notifyDataSetChanged();
} }
public void initModSasteFineItemKindData(long fid) { public void initModTasteFineItemKindData(long fid) {//34342
mFineItemOneLastPosition = -1; mFineItemOneLastPosition = -1;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
...@@ -3,29 +3,22 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.adapter; ...@@ -3,29 +3,22 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.adapter;
import android.content.Context; import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.constans.OrderTypeConstans; import com.gingersoft.gsa.cloud.common.constans.OrderTypeConstans;
import com.gingersoft.gsa.cloud.common.utils.AppDevices;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils; import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract; import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.util.PayMethodUtils;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse; import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.google.android.material.checkbox.MaterialCheckBox; import com.google.android.material.checkbox.MaterialCheckBox;
import com.jess.arms.base.BaseHolder; import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -142,7 +135,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -142,7 +135,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
} }
tv_people_num.setText(pax + orderBean.getPerson()); tv_people_num.setText(pax + orderBean.getPerson());
tv_pay_money_text.setText(amountText); tv_pay_money_text.setText(amountText);
tv_pay_money.setText(AppConstans.CARSH_STR + orderBean.getTotalAmount()); tv_pay_money.setText(AppConstant.CARSH_STR + orderBean.getTotalAmount());
//先将check回调情况，防止setChecked时反复调用onCheckedChanged方法 //先将check回调情况，防止setChecked时反复调用onCheckedChanged方法
cb_order.setOnCheckedChangeListener(null); cb_order.setOnCheckedChangeListener(null);
if (orderBean.getStatus() == OrderStatusContract.STATUS_6) { if (orderBean.getStatus() == OrderStatusContract.STATUS_6) {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/mealstand/MealFineAllFragment.java
...@@ -114,13 +114,13 @@ public class MealFineAllFragment extends BaseFragment<MealFineAllPresenter> impl ...@@ -114,13 +114,13 @@ public class MealFineAllFragment extends BaseFragment<MealFineAllPresenter> impl
final List<SoldoutCtrFood> soldoutCtrFoods = fineEvent.getSoldoutCtrFoods(); final List<SoldoutCtrFood> soldoutCtrFoods = fineEvent.getSoldoutCtrFoods();
if (productId != 0) { if (productId != 0) {
if (selectedMode == MealCartAdapter.SINGLE_SELECTED) { if (selectedMode == MealCartAdapter.SINGLE_SELECTED) {
if (currFinePage == 1) { if (currFinePage == 0) {
loadModSasteData(productId); loadModSasteData(productId);
} else { } else {
loadModMsgData(productId); loadModMsgData(productId);
} }
} else { } else {
if (currFinePage == 1) { if (currFinePage == 0) {
loadModSasteData(productId); loadModSasteData(productId);
} else { } else {
loadModCommData(productId); loadModCommData(productId);
...@@ -155,7 +155,7 @@ public class MealFineAllFragment extends BaseFragment<MealFineAllPresenter> impl ...@@ -155,7 +155,7 @@ public class MealFineAllFragment extends BaseFragment<MealFineAllPresenter> impl
} }
public void loadModSasteData(long fid) { public void loadModSasteData(long fid) {
mPresenter.initModSasteFineItemKindData(fid); mPresenter.initModTasteFineItemKindData(fid);
} }
public void loadModMsgData(long fid) { public void loadModMsgData(long fid) {
......
config.gradle
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
//正式版: 1.0.3 3 //正式版: 1.0.3 3
//內部測試版:1.2.0 20 //內部測試版:1.2.0 20
versionCode : 34, //38 versionCode : 34, //38
versionName : "1.3.4_3" //1.3.8 versionName : "1.3.4_4" //1.3.8
] ]
version = [ version = [
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/config/globalconfig/applyOptions/intercept/HeadersInterceptor.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.common.config.globalconfig.applyOptions.interce ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.common.config.globalconfig.applyOptions.interce
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.BuildConfig; import com.gingersoft.gsa.cloud.common.BuildConfig;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.oaId.DeviceID; import com.gingersoft.gsa.cloud.common.oaId.DeviceID;
import com.gingersoft.gsa.cloud.common.utils.encryption.Aes; import com.gingersoft.gsa.cloud.common.utils.encryption.Aes;
...@@ -10,7 +10,6 @@ import com.jess.arms.utils.DeviceUtils; ...@@ -10,7 +10,6 @@ import com.jess.arms.utils.DeviceUtils;
import java.io.IOException; import java.io.IOException;
import okhttp3.CacheControl;
import okhttp3.Headers; import okhttp3.Headers;
import okhttp3.Interceptor; import okhttp3.Interceptor;
import okhttp3.Request; import okhttp3.Request;
...@@ -31,7 +30,7 @@ public class HeadersInterceptor implements Interceptor { ...@@ -31,7 +30,7 @@ public class HeadersInterceptor implements Interceptor {
builder.set("mobileVersion", android.os.Build.VERSION.RELEASE); //安卓版本号 builder.set("mobileVersion", android.os.Build.VERSION.RELEASE); //安卓版本号
builder.set("mobileModel", android.os.Build.MODEL);//手机型号 builder.set("mobileModel", android.os.Build.MODEL);//手机型号
builder.set("mobileBrand", android.os.Build.BRAND);//手机品牌 builder.set("mobileBrand", android.os.Build.BRAND);//手机品牌
builder.set("apptype", AppConstans.APP_TYPE); builder.set("apptype", AppConstant.APP_TYPE);
builder.set("appinfo", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext())); builder.set("appinfo", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()));
builder.set("mobileId", "1"); builder.set("mobileId", "1");
builder.set("uid", UserContext.newInstance().getMemberId() + ""); builder.set("uid", UserContext.newInstance().getMemberId() + "");
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/constans/AppConstans.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/constans/AppConstant.java
package com.gingersoft.gsa.cloud.common.constans; package com.gingersoft.gsa.cloud.common.constans;
import android.content.Context;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.R;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.yanzhenjie.recyclerview.widget.BorderItemDecoration;
import java.util.Map;
import lombok.NonNull;
import okhttp3.FormBody;
/** /**
* Created by Wyh on 2019/12/21. * Created by Wyh on 2019/12/21.
*/ */
public class AppConstans { public class AppConstant {
/** /**
* 供應鏈首頁action * 供應鏈首頁action
*/ */
...@@ -40,4 +54,69 @@ public class AppConstans { ...@@ -40,4 +54,69 @@ public class AppConstans {
public static final int MOBILE_TYPE_HK_LENGTH = 8; public static final int MOBILE_TYPE_HK_LENGTH = 8;
public static final int MOBILE_TYPE_CH_LENGTH = 11; public static final int MOBILE_TYPE_CH_LENGTH = 11;
/**
* 逗號分隔符
*/
public static final String COMMA_SEPARATED = ",";
public static final String GET_INFO_ERROR = "數據獲取失敗，請稍候再試";
public static final String INFO_SYNTAX_ERROR = "數據解析失敗，請聯繫開發人員";
public static final String GET_INFO_LOADING = "數據獲取中...";
public static final String QUERY_LOADING = "查詢中...";
public static final String IMG_UPLOAD_LOADING = "圖片上傳中...";
public static final String IMG_UPLOAD_FAIL = "圖片上傳失敗，請稍後重試";
public static final String NULL_INFO_ERROR = "未獲取到數據，請退出後重試";
public static final String SAVE_LOADING = "保存中...";
public static final String SAVE_SUCCESS = "保存成功";
public static final String SAVE_FAIL = "保存失敗，請稍後重試";
public static final String UPDATE_LOADING = "修改中...";
public static final String UPDATE_SUCCESS = "修改成功";
public static final String UPDATE_FAIL = "修改失敗，請稍後重試";
public static final String DELETE_LOADING = "刪除中...";
public static final String DELETE_SUCCESS = "刪除成功";
public static final String DELETE_FAIL = "刪除失敗，請稍後重試";
public static final int PAGE_SIZE = 10;
public static int getBrandId() {
return RestaurantInfoManager.newInstance().getBrandId();
// return BuildConfig.DEBUG ? 1 : RestaurantInfoManager.newInstance().getBrandId();
}
public static int getRestaurantId() {
return RestaurantInfoManager.newInstance().getRestaurantId();
// return BuildConfig.DEBUG ? 26 : RestaurantInfoManager.newInstance().getRestaurantId();
}
public static void addBrandId(@NonNull Map<String, Object> map) {
map.put("brandId", getBrandId());
}
public static void addRestaurantId(@NonNull Map<String, Object> map) {
map.put("restaurantId", getRestaurantId());
}
public static void addBrandId(@NonNull FormBody.Builder builder) {
builder.add("brandId", String.valueOf(getBrandId()));
}
public static void addRestaurantId(@NonNull FormBody.Builder builder) {
builder.add("restaurantId", String.valueOf(getRestaurantId()));
}
public static void addPageSize(Map<String, Object> map) {
map.put("pageSize", PAGE_SIZE);
}
public static void addPageIndex(Map<String, Object> map, int pageIndex) {
map.put("pageIndex", pageIndex * PAGE_SIZE);
}
public static RecyclerView.ItemDecoration getItemDecoration(Context context) {
return new BorderItemDecoration(ContextCompat.getColor(context, R.color.color_ccc));
}
} }
library-common/src/main/java/com/gingersoft/gsa/cloud/common/service/ICommandService.kt
...@@ -13,13 +13,12 @@ import android.os.Binder ...@@ -13,13 +13,12 @@ import android.os.Binder
import android.os.Build import android.os.Build
import android.os.IBinder import android.os.IBinder
import android.os.PowerManager import android.os.PowerManager
import android.util.Log
import android.widget.RemoteViews import android.widget.RemoteViews
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.common.R import com.gingersoft.gsa.cloud.common.R
import com.gingersoft.gsa.cloud.common.constans.AppConstans import com.gingersoft.gsa.cloud.common.constans.AppConstant
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans import com.gingersoft.gsa.cloud.common.constans.HttpsConstans
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
...@@ -150,7 +149,7 @@ class ICommandService : Service() { ...@@ -150,7 +149,7 @@ class ICommandService : Service() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
val mFilter = IntentFilter(AppConstans.CLEAR_ORDER_RECEIVING_HEART) val mFilter = IntentFilter(AppConstant.CLEAR_ORDER_RECEIVING_HEART)
mReceiver = ClearHeartBroadcastReceiver() mReceiver = ClearHeartBroadcastReceiver()
registerReceiver(mReceiver, mFilter) registerReceiver(mReceiver, mFilter)
...@@ -211,7 +210,7 @@ class ICommandService : Service() { ...@@ -211,7 +210,7 @@ class ICommandService : Service() {
} }
private fun startNotification(notifiyId: Int) { private fun startNotification(notifiyId: Int) {
val broadcastReceiver = Intent(AppConstans.CLEAR_ORDER_RECEIVING_HEART) val broadcastReceiver = Intent(AppConstant.CLEAR_ORDER_RECEIVING_HEART)
val broadcastIntent = PendingIntent.getBroadcast(this, 10, broadcastReceiver, 0) val broadcastIntent = PendingIntent.getBroadcast(this, 10, broadcastReceiver, 0)
var remoteViews: RemoteViews var remoteViews: RemoteViews
...@@ -396,7 +395,7 @@ class ICommandService : Service() { ...@@ -396,7 +395,7 @@ class ICommandService : Service() {
initSoundPool(R.raw.raw_disconnect) initSoundPool(R.raw.raw_disconnect)
myBind?.block?.invoke(true) myBind?.block?.invoke(true)
//推送給相關人員 //推送給相關人員
OkHttp3Utils.noticePersonnel(AppConstans.RP_HEART_ERROR, "心跳斷開六十秒以上未連接成功：" + t.message) OkHttp3Utils.noticePersonnel(AppConstant.RP_HEART_ERROR, "心跳斷開六十秒以上未連接成功：" + t.message)
} }
putTimeLog("onFailure連接失敗，開始等待一分鐘後重新連接") putTimeLog("onFailure連接失敗，開始等待一分鐘後重新連接")
} }
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/VibratorUtils.java
...@@ -6,7 +6,7 @@ import android.media.SoundPool; ...@@ -6,7 +6,7 @@ import android.media.SoundPool;
import android.os.Vibrator; import android.os.Vibrator;
import com.gingersoft.gsa.cloud.common.R; import com.gingersoft.gsa.cloud.common.R;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.utils.other.SPUtils; import com.gingersoft.gsa.cloud.common.utils.other.SPUtils;
/** /**
...@@ -23,8 +23,8 @@ public class VibratorUtils { ...@@ -23,8 +23,8 @@ public class VibratorUtils {
public static void pressButtonSound(Context context) { public static void pressButtonSound(Context context) {
SoundPool soundPool = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0); SoundPool soundPool = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0);
soundPool.load(context, R.raw.beep, 1); soundPool.load(context, R.raw.beep, 1);
int vibrationProgress = (int) SPUtils.get(AppConstans.VIBRATION_PROGRESS, 0); int vibrationProgress = (int) SPUtils.get(AppConstant.VIBRATION_PROGRESS, 0);
int presssoundProgress = (int) SPUtils.get(AppConstans.PRESSSOUND_PROGRESS, 0); int presssoundProgress = (int) SPUtils.get(AppConstant.PRESSSOUND_PROGRESS, 0);
try { try {
Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
if (vibrationProgress > 0) { if (vibrationProgress > 0) {
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/crash/AppCrashHandler.java
...@@ -46,7 +46,7 @@ import io.reactivex.disposables.Disposable; ...@@ -46,7 +46,7 @@ import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import static com.gingersoft.gsa.cloud.common.constans.AppConstans.RP_ERROR; import static com.gingersoft.gsa.cloud.common.constans.AppConstant.RP_ERROR;
public class AppCrashHandler implements UncaughtExceptionHandler { public class AppCrashHandler implements UncaughtExceptionHandler {
/** /**
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/time/TimeUtils.java
...@@ -113,7 +113,7 @@ public class TimeUtils { ...@@ -113,7 +113,7 @@ public class TimeUtils {
* @param timeStamp * @param timeStamp
* @return * @return
*/ */
public static String StampToData(SimpleDateFormat format, long timeStamp) { public static String stampToData(SimpleDateFormat format, long timeStamp) {
return format.format(new Date(timeStamp)); return format.format(new Date(timeStamp));
} }
...@@ -317,7 +317,10 @@ public class TimeUtils { ...@@ -317,7 +317,10 @@ public class TimeUtils {
return curDateTime; return curDateTime;
} }
//获取当前系统当天日期 /**
* 获取当前系统当天日期
* @return
*/
public static String getCurrentDay() { public static String getCurrentDay() {
String curDateTime = null; String curDateTime = null;
try { try {
...@@ -330,7 +333,10 @@ public class TimeUtils { ...@@ -330,7 +333,10 @@ public class TimeUtils {
return curDateTime; return curDateTime;
} }
//获取当前系统当天日期 /**
* 获取当前系统当天日期
* @return
*/
public static String getCurrentDay2() { public static String getCurrentDay2() {
String curDateTime = null; String curDateTime = null;
try { try {
...@@ -343,7 +349,11 @@ public class TimeUtils { ...@@ -343,7 +349,11 @@ public class TimeUtils {
return curDateTime; return curDateTime;
} }
//获取当前系统前后第几天 /**
* 获取当前系统前后第几天
* @param i
* @return
*/
public static String getNextDay(int i) { public static String getNextDay(int i) {
String curDateTime = null; String curDateTime = null;
try { try {
...@@ -357,7 +367,11 @@ public class TimeUtils { ...@@ -357,7 +367,11 @@ public class TimeUtils {
return curDateTime; return curDateTime;
} }
//获取当前系统前后第几天 /**
* 获取当前系统前后第几天
* @param i
* @return
*/
public static long getNextDayLong(int i) { public static long getNextDayLong(int i) {
long curDateTime = 0; long curDateTime = 0;
try { try {
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/device/pos/base/lifecycle/fragment/PosMatterFragment.java
...@@ -19,7 +19,7 @@ import android.widget.TextView; ...@@ -19,7 +19,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.loadsir.pos.BasePosCallback; import com.gingersoft.gsa.cloud.common.loadsir.pos.BasePosCallback;
import com.gingersoft.gsa.cloud.common.loadsir.pos.PosPayMatterCallback; import com.gingersoft.gsa.cloud.common.loadsir.pos.PosPayMatterCallback;
import com.gingersoft.gsa.cloud.common.loadsir.pos.PosRefundMatterCallback; import com.gingersoft.gsa.cloud.common.loadsir.pos.PosRefundMatterCallback;
...@@ -28,9 +28,7 @@ import com.gingersoft.gsa.cloud.common.loadsir.pos.PosTipsMatterCallback; ...@@ -28,9 +28,7 @@ import com.gingersoft.gsa.cloud.common.loadsir.pos.PosTipsMatterCallback;
import com.gingersoft.gsa.cloud.common.loadsir.pos.PosVoidMatterCallback; import com.gingersoft.gsa.cloud.common.loadsir.pos.PosVoidMatterCallback;
import com.gingersoft.gsa.cloud.order.R; import com.gingersoft.gsa.cloud.order.R;
import com.gingersoft.gsa.cloud.order.R2; import com.gingersoft.gsa.cloud.order.R2;
import com.gingersoft.gsa.cloud.pay.PayStep;
import com.gingersoft.gsa.cloud.pay.RequestParms; import com.gingersoft.gsa.cloud.pay.RequestParms;
import com.gingersoft.gsa.cloud.pay.device.pos.hyweb.constant.HywebActionStatusCode;
import com.jess.arms.base.BaseDialogFragment; import com.jess.arms.base.BaseDialogFragment;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.mvp.IView; import com.jess.arms.mvp.IView;
...@@ -160,14 +158,14 @@ public abstract class PosMatterFragment<P extends BasePresenter> extends BaseDia ...@@ -160,14 +158,14 @@ public abstract class PosMatterFragment<P extends BasePresenter> extends BaseDia
tv_pay_method = rootView.findViewById(com.gingersoft.gsa.cloud.common.R.id.tv_pay_method); tv_pay_method = rootView.findViewById(com.gingersoft.gsa.cloud.common.R.id.tv_pay_method);
tv_order_num.setText("單號：" + requestParms.getOrderId()); tv_order_num.setText("單號：" + requestParms.getOrderId());
tv_amount.setText(AppConstans.CARSH_STR + requestParms.getPayMoney()); tv_amount.setText(AppConstant.CARSH_STR + requestParms.getPayMoney());
tv_pay_method.setText(requestParms.getPayMethodName()); tv_pay_method.setText(requestParms.getPayMethodName());
} }
} }
private void initOrderDetail() { private void initOrderDetail() {
tvOrderNum.setText("單號：" + requestParms.getOrderId()); tvOrderNum.setText("單號：" + requestParms.getOrderId());
tvAmount.setText(AppConstans.CARSH_STR + requestParms.getPayMoney()); tvAmount.setText(AppConstant.CARSH_STR + requestParms.getPayMoney());
tvPaymethod.setText(requestParms.getPayMethodName()); tvPaymethod.setText(requestParms.getPayMethodName());
} }
......
library-print/src/main/java/com/gingersoft/gsa/cloud/print/bean/adapter/PrintContentAdapter.java
package com.gingersoft.gsa.cloud.print.bean.adapter; package com.gingersoft.gsa.cloud.print.bean.adapter;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstant;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport; import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
...@@ -254,7 +254,7 @@ public class PrintContentAdapter implements AdaptationContent { ...@@ -254,7 +254,7 @@ public class PrintContentAdapter implements AdaptationContent {
takeawayPrintContent.setFoodItemList(getPrintFoodItemsByProductBeans(data.getPRODUCT_NAME())); takeawayPrintContent.setFoodItemList(getPrintFoodItemsByProductBeans(data.getPRODUCT_NAME()));
takeawayPrintContent.setBillItemList(getBillItemListByInfo(data.getTOTAL_AMOUNT(), data.getLunchbox(), data.getDELIVERY_CHARGE(), data.getCouponList())); takeawayPrintContent.setBillItemList(getBillItemListByInfo(data.getTOTAL_AMOUNT(), data.getLunchbox(), data.getDELIVERY_CHARGE(), data.getCouponList()));
takeawayPrintContent.setTotalAmountText("總金額: "); takeawayPrintContent.setTotalAmountText("總金額: ");
takeawayPrintContent.setTotalAmount(AppConstans.CARSH_STR + data.getTOTAL_AMOUNT()); takeawayPrintContent.setTotalAmount(AppConstant.CARSH_STR + data.getTOTAL_AMOUNT());
takeawayPrintContent.setPayAmountText("支付金額: "); takeawayPrintContent.setPayAmountText("支付金額: ");
double disCount = 0.0; double disCount = 0.0;
if (data.getCouponList() != null) { if (data.getCouponList() != null) {
...@@ -262,7 +262,7 @@ public class PrintContentAdapter implements AdaptationContent { ...@@ -262,7 +262,7 @@ public class PrintContentAdapter implements AdaptationContent {
disCount = MoneyUtil.sum(disCount, couponBean.getDiscount_amount()); disCount = MoneyUtil.sum(disCount, couponBean.getDiscount_amount());
} }
} }
takeawayPrintContent.setPayAmount(AppConstans.CARSH_STR + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), disCount)); takeawayPrintContent.setPayAmount(AppConstant.CARSH_STR + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), disCount));
takeawayPrintContent.setMemberName("會員名稱: " + data.getMEMBER_NAME()); takeawayPrintContent.setMemberName("會員名稱: " + data.getMEMBER_NAME());
// takeawayPrintContent.setMemberNumber(data.getm); // takeawayPrintContent.setMemberNumber(data.getm);
takeawayPrintContent.setMemberPhone("會員電話: " + data.getPHONE()); takeawayPrintContent.setMemberPhone("會員電話: " + data.getPHONE());
...@@ -316,16 +316,16 @@ public class PrintContentAdapter implements AdaptationContent { ...@@ -316,16 +316,16 @@ public class PrintContentAdapter implements AdaptationContent {
private List<PrintBillItem> getBillItemListByInfo(String totalAmount, double lunchbox, double deliveryCharge, List<OrderDetails.DataBean.CouponBean> couponBeanList) { private List<PrintBillItem> getBillItemListByInfo(String totalAmount, double lunchbox, double deliveryCharge, List<OrderDetails.DataBean.CouponBean> couponBeanList) {
List<PrintBillItem> billItems = new ArrayList<>(); List<PrintBillItem> billItems = new ArrayList<>();
billItems.add(new PrintBillItem("合計: ", AppConstans.CARSH_STR + MoneyUtil.sub(MoneyUtil.sub(Double.parseDouble(totalAmount), lunchbox), deliveryCharge))); billItems.add(new PrintBillItem("合計: ", AppConstant.CARSH_STR + MoneyUtil.sub(MoneyUtil.sub(Double.parseDouble(totalAmount), lunchbox), deliveryCharge)));
if (lunchbox != 0.0) { if (lunchbox != 0.0) {
billItems.add(new PrintBillItem("餐盒費: ", AppConstans.CARSH_STR + lunchbox)); billItems.add(new PrintBillItem("餐盒費: ", AppConstant.CARSH_STR + lunchbox));
} }
if (deliveryCharge != 0.0) { if (deliveryCharge != 0.0) {
billItems.add(new PrintBillItem("送貨費: ", AppConstans.CARSH_STR + deliveryCharge)); billItems.add(new PrintBillItem("送貨費: ", AppConstant.CARSH_STR + deliveryCharge));
} }
if (couponBeanList != null && couponBeanList.size() > 0) { if (couponBeanList != null && couponBeanList.size() > 0) {
for (OrderDetails.DataBean.CouponBean couponBean : couponBeanList) { for (OrderDetails.DataBean.CouponBean couponBean : couponBeanList) {
billItems.add(new PrintBillItem(couponBean.getCouponName(), AppConstans.CARSH_STR + couponBean.getDiscount_amount())); billItems.add(new PrintBillItem(couponBean.getCouponName(), AppConstant.CARSH_STR + couponBean.getDiscount_amount()));
} }
} }
return billItems; return billItems;
...@@ -335,7 +335,7 @@ public class PrintContentAdapter implements AdaptationContent { ...@@ -335,7 +335,7 @@ public class PrintContentAdapter implements AdaptationContent {
List<PrintPayTypeItem> printPayTypeItems = new ArrayList<>(); List<PrintPayTypeItem> printPayTypeItems = new ArrayList<>();
if (payMultiples != null) { if (payMultiples != null) {
for (OrderDetails.DataBean.PayMultiple payMultiple : payMultiples) { for (OrderDetails.DataBean.PayMultiple payMultiple : payMultiples) {
printPayTypeItems.add(new PrintPayTypeItem(payMultiple.getPayName(), AppConstans.CARSH_STR + payMultiple.getAmount())); printPayTypeItems.add(new PrintPayTypeItem(payMultiple.getPayName(), AppConstant.CARSH_STR + payMultiple.getAmount()));
} }
} }
return printPayTypeItems; return printPayTypeItems;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment