|
|
@@ -223,7 +223,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
|
|
super.onViewCreated(view, savedInstanceState);
|
|
|
|
|
|
- ImageView ivLogo=view.findViewById(R.id.iv_logo);
|
|
|
+ ImageView ivLogo = view.findViewById(R.id.iv_logo);
|
|
|
DrawableSelectorUtils.setImageLogo(ivLogo);
|
|
|
Log.d(TAG, "onViewCreated: 1");
|
|
|
Bundle bundle = getArguments();
|
|
|
@@ -357,7 +357,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
});
|
|
|
}
|
|
|
}, 1, TimeUnit.SECONDS);
|
|
|
- if (App.app.payChannel == Constant.PAY_PRICE_MODEL || App.app.payChannel == Constant.PAY_NAYAX_PAY_MIX||App.app.payChannel==Constant.PAY_ONLINE_AND_PRICE_MODEL) {
|
|
|
+ if (App.app.payChannel == Constant.PAY_PRICE_MODEL || App.app.payChannel == Constant.PAY_NAYAX_PAY_MIX || App.app.payChannel == Constant.PAY_ONLINE_AND_PRICE_MODEL) {
|
|
|
findViewById(R.id.rl_money_show).setVisibility(View.VISIBLE);
|
|
|
}
|
|
|
}
|
|
|
@@ -447,7 +447,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
String result = data.commandsHex.substring(6, 10);
|
|
|
double coin = Integer.parseInt(result, 16) / 100.00;
|
|
|
if (!result.equals("0000")) {
|
|
|
- Global.hascoin = Global.hascoin.add(new BigDecimal((coin *Global.coinMultiplier)/Global.coinMultiplierDivide)).setScale(2, RoundingMode.HALF_UP);
|
|
|
+ Global.hascoin = Global.hascoin.add(new BigDecimal((coin * Global.coinMultiplier) / Global.coinMultiplierDivide)).setScale(2, RoundingMode.HALF_UP);
|
|
|
getDefault().post(new OfflineMessageEvent(Name.CURRENCYCHANGES, null));
|
|
|
}
|
|
|
}
|
|
|
@@ -520,7 +520,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
}
|
|
|
carsPay(str());//国内二码合一支付
|
|
|
Log.d(TAG, "onClick: 二码合一");
|
|
|
- }else if (App.app.payChannel == Constant.PAY_ONLINE_AND_PRICE_MODEL || manualReason != null) {
|
|
|
+ } else if (App.app.payChannel == Constant.PAY_ONLINE_AND_PRICE_MODEL || manualReason != null) {
|
|
|
dismissLoading();
|
|
|
showDialogChoosePay();
|
|
|
Log.d(TAG, "onClick: 二码合一");
|
|
|
@@ -546,7 +546,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
// return;
|
|
|
// }
|
|
|
if (!CommunicationHelper.getInstance().canGenerateOrder()){
|
|
|
- ToastUtil.getInstance().showText("设备异常");
|
|
|
+ ToastUtil.getInstance().showText(CommunicationHelper.getInstance().getWhyCanOrderText());
|
|
|
return;
|
|
|
}
|
|
|
addShopCart();
|
|
|
@@ -1377,7 +1377,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
break;
|
|
|
case Name.CURRENCYCHANGES://入钞了
|
|
|
tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue()));
|
|
|
- Log.d(TAG, "event: "+Global.hascoin.doubleValue());
|
|
|
+ Log.d(TAG, "event: " + Global.hascoin.doubleValue());
|
|
|
if (payMixDialog != null && payMixDialog.isShowing()) {
|
|
|
if (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() >= pri) {
|
|
|
tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() - pri));
|
|
|
@@ -1596,7 +1596,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
public void run() {
|
|
|
dismissLoading();
|
|
|
}
|
|
|
- },5000);
|
|
|
+ }, 5000);
|
|
|
}
|
|
|
|
|
|
private void stopTradingTimerDown(Timer timer, TimerTask task) {
|
|
|
@@ -1618,19 +1618,29 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
|
|
|
// 进入手动制作的界面
|
|
|
private void manualMake() {
|
|
|
- if (Global.isVersions!=1&&orderHelper.getOrderList().size()>0){
|
|
|
+ Log.d(TAG, "manualMake orderHelper: " + orderHelper.getOrderList().toString());
|
|
|
+ if (Global.isVersions != 1 && orderHelper.getOrderList().size() > 0) {
|
|
|
for (int i = 0; i < orderHelper.getOrderList().size(); i++) {
|
|
|
ShoppingCartBean shoppingCart = new ShoppingCartBean();
|
|
|
Log.d(TAG, "onClick: 冰淇淋组合：" + orderHelper.getOrderList().get(i).selectTag);
|
|
|
// "冰淇淋的金额:"+orderHelper.getOrderList().get(i).price+
|
|
|
- Log.d(TAG,"单个商品需要制作的杯数:" + orderHelper.getOrderList().get(i).buyCount);
|
|
|
+ Log.d(TAG, "单个商品需要制作的杯数:" + orderHelper.getOrderList().get(i).buyCount);
|
|
|
shoppingCart.setShoppingName(orderHelper.getOrderList().get(i).selectTag);//商品名字
|
|
|
shoppingCart.setCount(orderHelper.getOrderList().get(i).buyCount);
|
|
|
shoppingCart.setPrice(Double.parseDouble(orderHelper.getOrderList().get(i).price));
|
|
|
- saveCoinOrder(shoppingCart.getShoppingName(),shoppingCart.getPrice(),1,orderHelper.getOrderList().get(i).buyCount);
|
|
|
+ double totalSum = 0.0; // 用于存储总和
|
|
|
+ if (orderHelper.getOrderList().get(i).selectSpecBeans.size() > 0) {
|
|
|
+ for (int j = 0; j < orderHelper.getOrderList().get(i).selectSpecBeans.size(); j++) {
|
|
|
+ totalSum += Double.parseDouble(orderHelper.getOrderList().get(i).selectSpecBeans.get(i).price);
|
|
|
+ }
|
|
|
+ totalSum+=shoppingCart.getPrice();
|
|
|
+ } else {
|
|
|
+ totalSum = shoppingCart.getPrice();
|
|
|
+ }
|
|
|
+ saveCoinOrder(shoppingCart.getShoppingName(), totalSum, 1, orderHelper.getOrderList().get(i).buyCount);
|
|
|
}
|
|
|
}
|
|
|
- LogUtils.logWrite("制作了"+orderHelper.generateMakingIceCream().size()+"杯冰淇淋");
|
|
|
+ LogUtils.logWrite("制作了" + orderHelper.generateMakingIceCream().size() + "杯冰淇淋");
|
|
|
if (App.app.payChannel != Constant.PAY_FREE) {
|
|
|
LogUtils.logWrite("制作冰激凌了");
|
|
|
}
|
|
|
@@ -1655,7 +1665,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
|
|
|
// 添加购物车
|
|
|
private void addShopCart() {
|
|
|
- Log.d(TAG, "addShopCart: "+currentDish.selectSpecBeans);
|
|
|
+ Log.d(TAG, "addShopCart: " + currentDish.selectSpecBeans);
|
|
|
ResponseBean<Integer> result = addItem(currentDish.selectSpecBeans);
|
|
|
if (!result.success) {
|
|
|
return;
|
|
|
@@ -1819,7 +1829,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
ShoppingCartBean shoppingCart = new ShoppingCartBean();
|
|
|
Log.d(TAG, "onClick: 冰淇淋组合：" + orderHelper.getOrderList().get(i).selectTag);
|
|
|
// "冰淇淋的金额:"+orderHelper.getOrderList().get(i).price+
|
|
|
- Log.d(TAG,"单个商品需要制作的杯数:" + orderHelper.getOrderList().get(i).buyCount);
|
|
|
+ Log.d(TAG, "单个商品需要制作的杯数:" + orderHelper.getOrderList().get(i).buyCount);
|
|
|
String str = "";
|
|
|
String[] parts = orderHelper.getOrderList().get(i).selectTag.split(",");
|
|
|
str = getStr(str, parts);
|
|
|
@@ -1867,30 +1877,30 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
String getOneTaste = "";
|
|
|
for (String part : parts) {
|
|
|
Log.d(TAG, "onClick0: " + part);
|
|
|
- String[] getFlavorCombinations= part.split(priceBeans.get(0).getChineseName());
|
|
|
+ String[] getFlavorCombinations = part.split(priceBeans.get(0).getChineseName());
|
|
|
for (String getFlavorCombination : getFlavorCombinations) {
|
|
|
Log.d(TAG, "getStr:10 " + getFlavorCombination);
|
|
|
- if (getFlavorCombinations.length==1){
|
|
|
- getOneTaste=getFlavorCombination;
|
|
|
+ if (getFlavorCombinations.length == 1) {
|
|
|
+ getOneTaste = getFlavorCombination;
|
|
|
}
|
|
|
}
|
|
|
if (part.contains("_")) {
|
|
|
String[] getTaste = getFlavorCombinations[0].split("_");
|
|
|
for (int i = 0; i < getTaste.length; i++) {
|
|
|
- Log.d(TAG, "getStr:11 "+getTaste[i]);
|
|
|
+ Log.d(TAG, "getStr:11 " + getTaste[i]);
|
|
|
|
|
|
resultBuilder.append(getTaste[i]);
|
|
|
if (i < getTaste.length - 1) {
|
|
|
resultBuilder.append(",");
|
|
|
}
|
|
|
}
|
|
|
- str= SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0],getString(PriceFragment.ProductAbout.defaultName[0])) + "-"+resultBuilder.toString();
|
|
|
- Log.d(TAG, "getStr:测试 "+str);
|
|
|
- }else {
|
|
|
- if (getOneTaste.equals("")){
|
|
|
- str= SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0],getString(PriceFragment.ProductAbout.defaultName[0]));
|
|
|
- }else {
|
|
|
- str= SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0],getString(PriceFragment.ProductAbout.defaultName[0])) + "-"+getOneTaste;
|
|
|
+ str = SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0], getString(PriceFragment.ProductAbout.defaultName[0])) + "-" + resultBuilder.toString();
|
|
|
+ Log.d(TAG, "getStr:测试 " + str);
|
|
|
+ } else {
|
|
|
+ if (getOneTaste.equals("")) {
|
|
|
+ str = SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0], getString(PriceFragment.ProductAbout.defaultName[0]));
|
|
|
+ } else {
|
|
|
+ str = SPUtils.getInstance(App.app).getString(PriceFragment.ProductAbout.nameKey[0], getString(PriceFragment.ProductAbout.defaultName[0])) + "-" + getOneTaste;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1961,20 +1971,19 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
|
|
|
}, 1000);
|
|
|
}
|
|
|
|
|
|
- private void saveCoinOrder(String productName, double price, int payType,int count) {
|
|
|
+ private void saveCoinOrder(String productName, double price, int payType, int count) {
|
|
|
CoinOrdeBean bean = new CoinOrdeBean();
|
|
|
String sn = UUID.randomUUID().toString().replace("-", "");
|
|
|
bean.setClientId(Heartbeat.deviceId);
|
|
|
bean.setSn(sn);
|
|
|
bean.setPayType(payType);
|
|
|
- bean.setName(productName+"x"+count);
|
|
|
+ bean.setName(productName + "x" + count);
|
|
|
bean.setProductNumber(count);
|
|
|
bean.setPrice(price);
|
|
|
bean.setCreateDate(getStackCompleteTime());
|
|
|
- bean.setNo(productName+"-"+"I01"+"-"+count);
|
|
|
+ bean.setNo(productName + "-" + "I01" + "-" + count);
|
|
|
Gson gson = new Gson();
|
|
|
String json = gson.toJson(bean);
|
|
|
- Log.d(TAG, "saveCoinOrder: "+json);
|
|
|
RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json;charset=utf-8"), json);
|
|
|
addSubscription(OrderApi.api.newSaveCoinOrder(body).compose(HttpResultHandler.<String>transformer())
|
|
|
, new HttpResultObserver<String>(mView, getContext()) {
|
ccc
