Skip to content

S
supplier
Commit bc663d6d by Wyh
Options

Merge remote-tracking branch 'origin/dev' into dev

parents a2715edb 5cf2e2a2
Showing with 220 additions and 132 deletions
component-download/src/main/java/com/gingersoft/gsa/cloud/download/mvp/contract/DownloadContract.java
......@@ -39,17 +39,17 @@ public interface DownloadContract {
interface Model extends IModel {
Observable<FunctionRespone> downFunctionList(long userId);
Observable<BaseResult> downFunctionList(long userId);
Observable<BaseResult> downFoodList(int restaurantId);
Observable<ModifierRespone> downModifier(int restaurantId);
Observable<BaseResult> downModifier(int restaurantId);
Observable<FoodComboRespone> downFoodCombo(int restaurantId);
Observable<BaseResult> downFoodCombo(int restaurantId);
Observable<ComboItemRespone> downComboItem(int restaurantId);
Observable<BaseResult> downComboItem(int restaurantId);
Observable<FoodModifierRespone> downFoodModifier(int restaurantId);
Observable<BaseResult> downFoodModifier(int restaurantId);
Observable<BaseResult> downDiscount(int restaurantId);
......
component-download/src/main/java/com/gingersoft/gsa/cloud/download/mvp/model/DownloadModel.java
......@@ -53,7 +53,7 @@ public class DownloadModel extends BaseModel implements DownloadContract.Model {
}
@Override
public Observable<FunctionRespone> downFunctionList(long userId) {
public Observable<BaseResult> downFunctionList(long userId) {
return mRepositoryManager.obtainRetrofitService(DownloadService.class)
.downFunctionList(userId);
}
......@@ -65,25 +65,25 @@ public class DownloadModel extends BaseModel implements DownloadContract.Model {
}
@Override
public Observable<ModifierRespone> downModifier(int restaurantId) {
public Observable<BaseResult> downModifier(int restaurantId) {
return mRepositoryManager.obtainRetrofitService(DownloadService.class)
.downModifier(restaurantId);
}
@Override
public Observable<FoodComboRespone> downFoodCombo(int restaurantId) {
public Observable<BaseResult> downFoodCombo(int restaurantId) {
return mRepositoryManager.obtainRetrofitService(DownloadService.class)
.downFoodCombo(restaurantId);
}
@Override
public Observable<ComboItemRespone> downComboItem(int restaurantId) {
public Observable<BaseResult> downComboItem(int restaurantId) {
return mRepositoryManager.obtainRetrofitService(DownloadService.class)
.downComboItem(restaurantId);
}
@Override
public Observable<FoodModifierRespone> downFoodModifier(int restaurantId) {
public Observable<BaseResult> downFoodModifier(int restaurantId) {
return mRepositoryManager.obtainRetrofitService(DownloadService.class)
.downFoodModifier(restaurantId);
}
......
component-download/src/main/java/com/gingersoft/gsa/cloud/download/mvp/model/service/DownloadService.java
......@@ -18,22 +18,22 @@ import retrofit2.http.Query;
public interface DownloadService {
@GET("user/resource/list" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<FunctionRespone> downFunctionList(@Query("userId") long userId);
Observable<BaseResult> downFunctionList(@Query("userId") long userId);
@GET(Api.food_list + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> downFoodList(@Query("restaurantId") int restaurantId);
@GET(Api.modifier + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<ModifierRespone> downModifier(@Query("restaurantId") int restaurantId);
Observable<BaseResult> downModifier(@Query("restaurantId") int restaurantId);
@GET(Api.food_package_relation + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<FoodComboRespone> downFoodCombo(@Query("restaurantId") int restaurantId);
Observable<BaseResult> downFoodCombo(@Query("restaurantId") int restaurantId);
@GET(Api.food_comboItem + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<ComboItemRespone> downComboItem(@Query("restaurantId") int restaurantId);
Observable<BaseResult> downComboItem(@Query("restaurantId") int restaurantId);
@GET(Api.food_modifiere_relation + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<FoodModifierRespone> downFoodModifier(@Query("restaurantId") int restaurantId);
Observable<BaseResult> downFoodModifier(@Query("restaurantId") int restaurantId);
@GET(Api.restaurant_discount + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> downDiscount(@Query("restaurantId") int restaurantId);
......
component-download/src/main/java/com/gingersoft/gsa/cloud/download/mvp/ui/activity/DownloadActivity.java
......@@ -199,7 +199,6 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements
@Override
public void killMyself() {
mPresenter.stopDownDisposable();
onBackPressed();
}
......
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/ChooseRestaurantActivity.java
......@@ -22,6 +22,7 @@ import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -210,8 +211,8 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) {
RestaurantInfoManager.newInstance().setBrandInfo(new BrandInfo(brandId, brandName));
if (restaurantsBean != null) {
RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
,restaurantsBean.getGsPosShopId()));
RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(), restaurantsBean.getRestaurantName()
, restaurantsBean.getGsPosShopId()));
}
}
......@@ -266,6 +267,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
.call();
BrandsBean.BrandsData brandsBean = RestaurantInfoUtils.getBrandByRestaurantId(brands, item.getRestaurantId());
if (brandsBean != null) {
LoganManager.w_login(TAG, LoganManager.EVENT_SELECTED, "品牌=" + brandsBean.getBrandName() + " 餐廳=" + item.getRestaurantName());
saveBrandAndRestaurantInfo(brandsBean.getBrandId(), brandsBean.getBrandName(), item);
mPresenter.getLoginLimit(item.getRestaurantId(), true);
}
......@@ -301,6 +303,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
}
}
}
@Override
public void jumpActivity(Class activity) {
startActivity(new Intent(this, activity));
......@@ -352,10 +355,6 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
}).setGravity(Gravity.BOTTOM).show();
} else {
showMessage("獲取登陸人數失敗");
// GsaCloudApplication.logOut();
// UserContext.newInstance().logOut();
// launchActivity(new Intent(mContext, LoginActivity.class));
UserContext.newInstance().logOut();
}
}
......
component-main/src/main/AndroidManifest.xml
......@@ -9,7 +9,8 @@
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.NewMainActivity"
android:launchMode="singleTop"
android:alwaysRetainTaskState="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
<activity
android:name=".mvp.ui.activity.ExpandListActivity"
......
component-main/src/main/debug/AndroidManifest.xml
......@@ -20,7 +20,8 @@
<activity android:name=".mvp.ui.activity.menu.ShellActivity" />
<activity
android:name=".mvp.ui.activity.NewMainActivity"
android:launchMode="singleTop" />
android:launchMode="singleTask"
android:alwaysRetainTaskState="true" />
<activity android:name=".mvp.ui.activity.ExpandListActivity" />
<activity android:name=".mvp.ui.activity.RestaurantQrCodeActivity" />
<activity android:name=".mvp.ui.activity.LanguageActivity" />
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java
......@@ -6,7 +6,9 @@ import android.content.Intent;
import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCResult;
import com.billy.cc.core.component.CCUtil;
import com.billy.cc.core.component.IComponent;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.component.ComponentAction;
import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.common.function.FModule;
......@@ -18,6 +20,8 @@ import com.jess.arms.utils.ArmsUtils;
public class ComponentMain implements IComponent {
private final String TAG = getClass().getSimpleName();
public static final class main {
/**
* 首頁- 點餐
......@@ -79,6 +83,7 @@ public class ComponentMain implements IComponent {
String actionName = cc.getActionName();
switch (actionName) {
case "showMainActivity":
LoganManager.w_code(TAG,"onCall showMainActivity");
openActivity(cc);
break;
case "foodMenuActivity":
......@@ -129,8 +134,9 @@ public class ComponentMain implements IComponent {
Intent intent = new Intent(cc.getContext(), NewMainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
cc.getContext().startActivity(intent);
// CCUtil.createNavigateIntent(cc, MainActivity.class);
// CCUtil.createNavigateIntent(cc, NewMainActivity.class);
// CC.sendCCResult(cc.getCallId(), CCResult.success());
}
}
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -196,6 +196,11 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
}
@Override
protected void onResume() {
super.onResume();
initFuncationData();
......@@ -246,7 +251,12 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
MainSideMenuAdapter adapter = new MainSideMenuAdapter(mainSideMenuBeans);
mRvSideMenu.setAdapter(adapter);
adapter.setOnItemClickListener((adapter1, view, position) -> {
switch (mainSideMenuBeans.get(position).getFunctionName()) {
String functionName = mainSideMenuBeans.get(position).getFunctionName();
LoganManager.w_home(TAG, LoganManager.EVENT_CLICK + functionName);
switch (functionName) {
case "切換環境":
//切換環境
CC.obtainBuilder(ComponentName.COMPONENT_LOGIN)
......@@ -388,6 +398,9 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
}
private void functionClick(String name, int status) {
LoganManager.w_home(TAG, LoganManager.EVENT_CLICK + name);
switch (name) {
case "餐檯模式":
CC.obtainBuilder(ComponentName.COMPONENT_TABLE)
......@@ -591,9 +604,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
showMessage("再按一次退出應用");
mExitTime = System.currentTimeMillis();
} else {
finish();
ArmsUtils.exitApp();
// System.exit(0);
}
}
return true;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
......@@ -12,6 +12,7 @@ import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
......@@ -273,6 +274,8 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
double wholeAmount = getFoodTotal();
mShoppingCart.setWholeAmount(wholeAmount);
LoganManager.w_tableMode(TAG, "合計金額=" + wholeAmount);
disposable = Observable.just(wholeAmount)
.subscribeOn(Schedulers.computation())
/**
......@@ -285,13 +288,14 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
int serviceCharge = mDoshokuOrder.getOpenTableInfo().getServiceCharge();
if (serviceCharge > 0) {
ServiceChargeItem item = new ServiceChargeItem(serviceChargeStr);
double serviceChargeMoney = getServiceableAmout();
totalAmount = item.updateBillItem(serviceChargeMoney, serviceCharge);
if (Double.doubleToLongBits(item.getMoney()) != 0.0) {
mBillItemList.add(item);
mShoppingCart.setServiceCharge(item.getMoney());
}
LoganManager.w_tableMode(TAG, "服務費=" + serviceChargeMoney);
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CALCULATE, "服務費後總金額=" + totalAmount);
}
}
return totalAmount;
......@@ -312,6 +316,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
if (orderDiscounts != null) {
for (OrderDiscountResponse orderDiscount : orderDiscounts) {
if (orderDiscount.getType() == OrderDiscountRequest.ORDER_DISCOUNT) {
LoganManager.w_tableMode(TAG, "已下單整單折扣金額=" + orderDiscount.getDiscountAmount());
//整單折扣
Discount discount = new Discount();
discount.setId(orderDiscount.getDiscountId());
......@@ -326,7 +331,9 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
if (memberInfo != null) {
mShoppingCart.addMultyDiscount(mShoppingCart.createMemberDiscount(memberInfo, BillItem.BILL_ITEM_ORDER_SENT_STATUS));
}
LoganManager.w_tableMode(TAG, "已下單會員折扣比例=" + memberInfo.getMemberPoint());
} else if (orderDiscount.getType() == OrderDiscountRequest.COUPON_DISCOUNT) {
LoganManager.w_tableMode(TAG, "已下單優惠券折扣金額=" + orderDiscount.getDiscountAmount());
//優惠券折扣
CouponDiscountBean couponDiscount = new CouponDiscountBean();
couponDiscount.setCouponTypeName1(orderDiscount.getRemark());
......@@ -345,9 +352,11 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
setOrderMealPasteDSMark();
//計算折扣金額
double discountableMoney = getDiscountableAmount();
LoganManager.w_tableMode(TAG, "可折扣金額=" + discountableMoney);
if (mShoppingCart.getMultyDiscountList().size() > 0) {
//調用折扣鏈進行計算
totalAmount = MoneyUtil.sub(totalAmount, mShoppingCart.calculateLinkedDiscounts(discountableMoney));
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CALCULATE, "賬單後總金額=" + totalAmount);
}
return totalAmount;
}
......@@ -360,6 +369,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
public Double apply(Double totalAmount) throws Exception {
double roundingTotalAmount = getTotalAmountFilterByType(BillItem.ROUNDING_TYPE);
if (roundingTotalAmount > 0) {
LoganManager.w_tableMode(TAG, "賬單小數=" + roundingTotalAmount);
RoundingItem item = new RoundingItem(roundingStr);
totalAmount = item.updateBillItem(roundingTotalAmount);
if (Double.doubleToLongBits(item.getMoney()) != 0.0) {
......@@ -382,6 +392,8 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
//刷新美食Item數據
mSelectMealAdapter.notifyDataSetChanged();
LoganManager.w_tableMode(TAG, "總金額=" + totalAmount);
if (mOrderContentActivity != null) {
mOrderContentActivity.initOrderBill(wholeAmount, totalAmount);
}
......@@ -454,13 +466,13 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
public void onRequestPermissionSuccess() {
String title = null;
if (IActivity instanceof MealStandActivity) {
title ="掃描會員碼";
title = "掃描會員碼";
} else if (IActivity instanceof OrderContentActivity) {
title ="掃描優惠券碼";
title = "掃描優惠券碼";
}
CC.obtainBuilder(ComponentName.COMPONENT_SCAN)
.setActionName("openScanActivity")
.addParam("title",title)
.addParam("title", title)
.build()
.callAsyncCallbackOnMainThread((cc, result) -> {
......@@ -488,6 +500,9 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
}
OrderDetail orderFood = mOrderMealList.get(mSelectMealAdapter.getSelect_full_start_position());
OrderDetail orderMainFood = mOrderMealList.get(mSelectMealAdapter.getMainStartPos());
LoganManager.w_tableMode(TAG, LoganManager.EVENT_MODIFY, orderFood.getProductName() + " 數量=" + number);
mShoppingCart.changeNumber(number, orderFood, orderMainFood,
mSelectMealAdapter.getSelect_full_start_position(),
mSelectMealAdapter.getSelect_full_end_position(),
......@@ -495,6 +510,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
@Override
public void achieveMaximum(String name) {
String msg = "[" + name + "]" + "已售罄";
LoganManager.w_tableMode(TAG, msg);
CommonTipDialog.showSurpisedDialog(IActivity, msg, null, null, null, null, null);
}
});
......@@ -948,7 +964,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
}
protected CreateOrderRequest getCreateOrderRequest(List<OrderDetail> foodList) {
List<OrderDetail> newFoodList = OrderDetail.transNewOrderDetails(foodList);
List<OrderDetail> newFoodList = OrderDetail.transNewOrderDetails(foodList);
if (RestaurantExpandInfoUtils.getValue(ExpandConstant.MergeSendFood, true)) {
//合并未送单主食品
mergeMainFoodNumber(newFoodList);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
......@@ -14,6 +14,7 @@ import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
......@@ -199,7 +200,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
this.mAppManager = null;
this.mImageLoader = null;
this.mApplication = null;
if(mMealDiscountAction != null){
if (mMealDiscountAction != null) {
mMealDiscountAction.destroy();
}
}
......@@ -317,6 +318,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
if (!foodConditionFilter(datasBean)) {
return;
}
LoganManager.w_tableMode(TAG, LoganManager.EVENT_ADD + "食品【" + datasBean.getFoodName() + "】");
RvMealClicked = false;
if (datasBean.getIsParent() == 0) {
changedMealByParentId(datasBean.getId());
......@@ -343,6 +345,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
//已送單數量已等於最大數，不能繼續添加
return;
}
LoganManager.w_tableMode(TAG, LoganManager.EVENT_ADD + "子食品【" + datasBean.getName() + "】");
//设置当前操作的套餐细项
long id = mCurrentOrderDetailBean.isNew() ? mCurrentOrderDetailBean.getProductId() : mCurrentOrderDetailBean.getId();
mCurrentOrderDetailBean = OrderDetail.comboTransOrderDetail(datasBean, id, mCurrentOrderDetailBean.getProductId(), 1, OrderDetail.COMBO_PROP, RvMealClicked);
......@@ -375,6 +378,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
//已送單數量已等於最大數，不能繼續添加
return;
}
LoganManager.w_tableMode(TAG, LoganManager.EVENT_ADD + "細項【" + datasBean.getName() + "】");
// if (datasBean.isModKeyboard()) {
// addModalKeyBoardModfier(datasBean.getModifier());
// displayModalKeyBoardDialog();
......@@ -401,6 +405,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
if (!discountConditionFilter(discountBean)) {
return;
}
LoganManager.w_tableMode(TAG, LoganManager.EVENT_ADD + "折扣【" + discountBean.getRemark() + "】");
// if (cutOutDiscount() == -100) {
// return;
// }
......@@ -890,13 +895,13 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
mergeMainFoodNumber(mOrderMealList);
}
PrintContent printContent = new PrintContentAdapter().adaptationServingPaperContent(DoshokuOrder.getInstance(),mTableInfo);
PrintContent printContent = new PrintContentAdapter().adaptationServingPaperContent(DoshokuOrder.getInstance(), mTableInfo);
CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
.setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_SERVE)
.addParam(PrintConstans.PRINT_CONTENT,printContent)
.addParam(PrintConstans.PRINT_ORDER_NO,DoshokuOrder.getInstance().getOrderNo())
.addParam(PrintConstans.PRINT_CONTENT, printContent)
.addParam(PrintConstans.PRINT_ORDER_NO, DoshokuOrder.getInstance().getOrderNo())
.build()
.callAsyncCallbackOnMainThread((cc, result) -> {
if (result.isSuccess()) {
......@@ -1062,6 +1067,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
mCancelFoodDialog.build().dismiss();
mCancelFoodDialog = null;
}
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "確刪除");
markDeleteFood(maxNumber, deleteNumber, reasonId, reason);
});
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
......@@ -1074,6 +1080,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
mCancelFoodDialog.setOnClickListener(new CancelFoodDialog.OnClickListener() {
@Override
public void onItemClick(FoodReason item, int position, int deleteNumber) {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "刪除原因=" + item.getContent());
showDeleteFoodDialog(deleteFood.getNumber(), deleteNumber, item.getId(), item.getContent());
}
});
......@@ -1113,12 +1120,15 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
if (!deleteFood.isNew()) {
//TODO 刪除已下單食品
if (!deleteFood.isModify()) {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "刪除已下單食品【" + deleteFood.getRemark() + "】");
deleteWithOrderedFood(deleteFood);
}
} else {
if (deleteStyle == 2) {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_LONG_CLICK + "刪除【" + deleteFood.getRemark() + "】");
mSelectMealAdapter.removeAllNewFoodItem();
} else {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "刪除【" + deleteFood.getRemark() + "】");
int deletePosition = mSelectMealAdapter.removeFoodItem();
mRootView.setMealRvScrollToPosition(deletePosition);
//更新最大可選數
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
......@@ -17,6 +17,7 @@ import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.table.TableExtBean;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.component.ComponentName;
......@@ -174,6 +175,8 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
@Override
public void onItemClick(View v, Function function) {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK,function.getResName());
mRootView.recordOperat(true);
switch (function.getResName()) {
......@@ -234,6 +237,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
@Override
public boolean onItemLongClick(View v, Function datasBean) {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_LONG_CLICK,datasBean.getResName());
if (datasBean.getResName().equals("印單") || datasBean.getResName().equals("送單")) {
PrinterUtils.switchPrintMethod(IActivity, datasBean, mOrderTopFunctionAdapter);
}
......@@ -683,7 +687,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
updateBillInfo();
IActivity.backPressed();
} else {
mRootView.showMessage("獲取訂單數據失敗");
mRootView.showMessage(info.getErrMsg());
}
}
});
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
......@@ -8,6 +8,7 @@ import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
......@@ -180,10 +181,12 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
}
}
}
LoganManager.w_pay(TAG, "支付成功");
mRootView.showMessage("支付成功");
//結賬成功
mRootView.paySuccess();
} else {
LoganManager.w_pay(TAG, "支付失敗=" + baseResult.getErrMsg());
mRootView.showMessage(baseResult.getErrMsg());
}
}
......@@ -267,8 +270,11 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
@Override
public void onNext(BaseResult baseResult) {
if (baseResult.isSuccess()) {
LoganManager.w_pay(TAG, "修改訂單支付成功");
//結賬成功
mRootView.paySuccess();
}else {
LoganManager.w_pay(TAG, "修改訂單支付失敗=" + baseResult.getErrMsg());
}
}
});
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
......@@ -41,6 +41,7 @@ import com.gingersoft.gsa.cloud.common.constans.MealConstant;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.scan.ScanHelper;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.VibratorUtils;
......@@ -524,8 +525,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
public void onPageSelected(int position) {
currentFinePage = position;
if (currentFinePage == 0) {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "口味");
tv_fine_type.setText("口味");
} else {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "訊息");
tv_fine_type.setText("訊息");
}
}
......@@ -588,6 +591,9 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@OnClick(R2.id.btn_meal_discount)
void onClickDiscount() {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "食品折扣");
OrderDetail mainOrderDetail = mPresenter.getSelectMealAdapter().getCurrentMainOrderDetail();
if (mainOrderDetail != null && mainOrderDetail.getAblediscount() == 0) {
showMessage("此食品不能參與折扣!");
......@@ -604,6 +610,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
if (BaseOrder.isCurrentOrderType(FoodSummaryConstans.TAKEAWAY_TYPE)) {
return;
}
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK + "餐檯名稱");
//type取值：1:qrCdoetype，2:手機號，3:memberId
if (mUseMemberDialog == null) {
mUseMemberDialog = new UseMemberDialog(this)
......@@ -652,7 +659,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
DoshokuOrder.getInstance().setMemberInfo(null);
DiscountItem memberDiscountBillItem = (DiscountItem) mPresenter.findBillItemByClass(MemberDiscount.class);
if(memberDiscountBillItem != null){
if (memberDiscountBillItem != null) {
ShoppingCart shoppingCart = mPresenter.getShoppingCart();
shoppingCart.delMultyDiscount(memberDiscountBillItem.getDiscount());
//更新賬單信息
......@@ -687,6 +694,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@OnClick(R2.id.btn_multiple_selection)
void onClickMultipleSelection() {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, "多选");
currentFinePage = 0;
if (mPresenter.getSelectMealAdapter().getSelectedMode() == SelectMealAdapter.MULTIPLE_SELECTED) {
mPresenter.getSelectMealAdapter().setSelectedMode(SelectMealAdapter.SINGLE_SELECTED);
......@@ -703,11 +711,13 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@OnClick(R2.id.btn_select_all)
void onClickSelectAll() {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, "全選");
mPresenter.setSelectAll();
}
@OnClick(R2.id.btn_anti_selection)
void onClickAntiSelection() {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, "反選");
mPresenter.setAntiSelect();
}
......@@ -716,6 +726,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
R2.id.btn_taste, R2.id.btn_msg, R2.id.btn_delete, R2.id.btn_end, R2.id.iv_fine_back})
public void onClick(View v) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK, v.getTransitionName());
}
recordOperat(true);
//防抖處理
......@@ -1356,6 +1370,9 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@Override
public void onPageSelect(int pageIndex) {
mPageIndex = pageIndex;
LoganManager.w_tableMode(TAG, LoganManager.EVENT_SCOLL + "食品組頁=" + (pageIndex + 1));
for (int i = 0; i < totalPage; i++) {
if (i == pageIndex) {
ivPoints[i].setImageResource(R.drawable.meal_food_group_point_focuese);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
......@@ -181,6 +181,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
gsaPayView.setOnSelectPayClickLisenter(new OrderPayView.OnSelectPayClickLisenter() {
@Override
public void addClick(PayMethod method) {
LoganManager.w_pay(TAG, LoganManager.EVENT_ADD, "支付方式=" + method.getPayName());
if (method.getPayType() == PayMethod.PAY_TYPE_INTEGRAL) {
updateMemberInfo();
}
......@@ -188,6 +189,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
@Override
public void delClick(PayMethod method) {
LoganManager.w_pay(TAG, LoganManager.EVENT_DELETE, "支付方式=" + method.getPayName());
if (method.getPayType() == PayMethod.PAY_TYPE_INTEGRAL) {
updateMemberInfo();
}
......@@ -201,6 +203,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
gsaPayView.setOnFreeServiceStatusChangeLisenter(new OrderPayView.OnFreeServiceStatusChangeLisenter() {
@Override
public void onFreeServiceStautsChange(boolean isUseFreeServicePayMethod) {
LoganManager.w_pay(TAG, "是否選中免服務費支付方式=" + isUseFreeServicePayMethod);
mPresenter.setFreeServiceStauts(isUseFreeServicePayMethod);
}
});
......@@ -234,6 +237,8 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
double wholeAmount = mPresenter.getFoodTotal();
tv_whole.setText("合計 $" + wholeAmount);
LoganManager.w_pay(TAG, "合計金額=" + wholeAmount);
DoshokuOrder.getInstance().getShoppingCart().setWholeAmount(wholeAmount);
}
......@@ -397,7 +402,6 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
recordOperat(true);
}
});
}
......@@ -410,7 +414,6 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
recordOperat(true);
}
});
dialogBuilder.create(R.style.QMUI_Dialog).show();
......@@ -466,7 +469,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
.callAsyncCallbackOnMainThread(new IComponentCallback() {
@Override
public void onResult(CC cc, CCResult result) {
LoganManager.w_tableMode(TAG, "printOpenInstructionAndBill " + "是否成功：" + result.isSuccess());
LoganManager.w_pay(TAG, "開錢箱結果：" + result.isSuccess());
mAppManager.killActivity("PrintActivity");
}
});
......@@ -495,7 +498,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
.callAsyncCallbackOnMainThread(new IComponentCallback() {
@Override
public void onResult(CC cc, CCResult result) {
LoganManager.w_tableMode(TAG, "printBill " + "是否成功打印：" + result.isSuccess());
LoganManager.w_pay(TAG, "結賬單打印結果：" + result.isSuccess());
printEndBack();
}
});
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
......@@ -224,7 +224,6 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
rightButton2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LoganManager.w_tableMode(TAG, "跳轉數據下載頁");
CC.obtainBuilder(ComponentName.COMPONENT_DOWNLOAD)
.setActionName("showDownloadActivity")
.addParam("fromPage", 2)
......@@ -321,11 +320,11 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
public void longClickSkyorder() {
boolean state = mPresenter.setSkyorderMode();
if (state) {
LoganManager.w_tableMode(TAG, "長按鎖定Skyorder模式");
LoganManager.w_tableMode(TAG, LoganManager.EVENT_LONG_CLICK,"鎖定Skyorder模式");
mTopBar.setTitle("打印skyorder");
mPresenter.openSkyorderMode();
} else {
LoganManager.w_tableMode(TAG, "長按解鎖Skyorder模式");
LoganManager.w_tableMode(TAG, LoganManager.EVENT_LONG_CLICK,"解鎖Skyorder模式");
canceTableAction();
}
setLockVisibility(state);
......@@ -334,7 +333,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
@OnClick(R2.id.rl_skyorder)
public void clickSkyorder() {
LoganManager.w_tableMode(TAG, "點擊Skyorder按鈕");
LoganManager.w_tableMode(TAG, LoganManager.EVENT_CLICK,"Skyorder");
TableAction tableAction = mPresenter.getTableActionByClass(PrintSkyorderAction.class);
if (tableAction != null) {
mPresenter.setTableAction(tableAction);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderCenterActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.Message;
import android.view.View;
......@@ -15,6 +16,7 @@ import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.pay.pos.fragment.PosActionStatusExceptionFragment;
import com.gingersoft.gsa.cloud.table.R;
......@@ -144,6 +146,10 @@ public class OrderCenterActivity extends BaseFragmentActivity<OrderCenterPresent
@OnClick({R2.id.btn_print_order, R2.id.btn_modify_order, R2.id.btn_tips, R2.id.btn_cancel_order, R2.id.btn_refund})
public void OnClick(View v) {
OrderManagerResponse orderItem = getCurrentOrderFragment().getCheckedOrderBean();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
LoganManager.w_order(TAG, LoganManager.EVENT_CLICK, "按鈕：" + v.getTransitionName());
}
LoganManager.w_order(TAG, LoganManager.EVENT_CLICK, "操作訂單：" + orderItem.getOrderNo());
if (orderItem != null) {
int id = v.getId();
if (id == R.id.btn_print_order) {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java
package com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
......@@ -217,6 +218,9 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
@OnClick({R2.id.btn_print_order, R2.id.btn_cancel_order, R2.id.btn_modify_order, R2.id.btn_tips, R2.id.btn_refund})
public void onClick(View v) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
LoganManager.w_order(TAG, LoganManager.EVENT_CLICK, "按鈕：" + v.getTransitionName());
}
int id = v.getId();
if (id == R.id.btn_print_order) {
mPresenter.printOrder(this, mOrderDetailItem);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/CancelFoodDialog.java
......@@ -21,6 +21,7 @@ import com.google.android.flexbox.FlexWrap;
import com.google.android.flexbox.FlexboxLayoutManager;
import com.google.android.flexbox.JustifyContent;
import com.google.android.material.slider.Slider;
import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.layout.QMUILinearLayout;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUIEmptyView;
......@@ -148,7 +149,9 @@ public class CancelFoodDialog extends BaseRetryDialog implements Slider.OnSlider
btn_all_number.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
slider_food_count.setValue(mMaxCancelNumber);
mCurrCancelNumber = mMaxCancelNumber;
slider_food_count.setValue(mCurrCancelNumber);
tv_number_value.setText(String.valueOf(mCurrCancelNumber));
}
});
ll_container.setRadiusAndShadow(mRadius, QMUIDisplayHelper.dp2px(mContext, mShadowElevationDp), mShadowAlpha);
......@@ -161,7 +164,7 @@ public class CancelFoodDialog extends BaseRetryDialog implements Slider.OnSlider
public void initParmas() {
mCurrCancelNumber = 1;
tv_number_value.setText(String.valueOf(mCurrCancelNumber));
slider_food_count.setValueFrom(mCurrCancelNumber);
slider_food_count.setValueFrom(0);
slider_food_count.setValueTo(mMaxCancelNumber);
slider_food_count.setValue(mCurrCancelNumber);
}
......@@ -176,6 +179,10 @@ public class CancelFoodDialog extends BaseRetryDialog implements Slider.OnSlider
mAdapter = new FoodReasonAdapter(mItems);
}
mAdapter.setOnItemClickListener((adapter, view, position) -> {
if (mCurrCancelNumber == 0) {
ArmsUtils.makeText(mContext, "請選擇取消數量");
return;
}
if (onClickListener != null) {
onClickListener.onItemClick(mItems.get(position), position, getInputNumber());
}
......@@ -225,13 +232,12 @@ public class CancelFoodDialog extends BaseRetryDialog implements Slider.OnSlider
@Override
public void onStartTrackingTouch(@NonNull Slider slider) {
mCurrCancelNumber = 1;
tv_number_value.setText(String.valueOf(slider.getValue()));
}
@Override
public void onStopTrackingTouch(@NonNull Slider slider) {
mCurrCancelNumber = (int) slider.getValue();
tv_number_value.setText(String.valueOf(mCurrCancelNumber));
}
public interface OnClickListener {
......
component-table/src/main/res/layout/table_dialog_cancel_food.xml
......@@ -69,18 +69,14 @@
android:layout_margin="@dimen/dp_8"
android:orientation="vertical">
<!-- <com.google.android.material.slider.Slider-->
<!-- android:id="@+id/slider_food_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:qmui_slider_bar_progress_color="@color/theme_color" />-->
<com.google.android.material.slider.Slider
android:id="@+id/slider_food_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/SliderStyle"
android:valueFrom="0"
android:valueTo="11"
android:value="1"
android:stepSize="1" />
<TextView
......
config.gradle
......@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 29,
//正式版: 1.0.3 3
//內部測試版:1.2.0 20
versionCode : 22,
versionName : "1.2.2"
versionCode : 23,
versionName : "1.2.3"
]
version = [
......
library-common/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
......@@ -348,12 +348,12 @@ public class GsaCloudApplication extends BaseApplication {
@Override
public void onPrinterDataBefore(int orderType, int printType, String printerData, String printerDeviceInfo) {
LoganManager.w_printer(TAG, "打印前数据--> printerData=" + printerData + " printerDeviceInfo=" + printerDeviceInfo);
LoganManager.w_printer(TAG, "打印前数据-> printerData=" + printerData + " printerDeviceInfo=" + printerDeviceInfo);
}
@Override
public void onPrinterBitmapBefore(int orderType, int printType, String directoryName, List<Bitmap> bitmaps) {
LoganManager.w_printer(TAG, "生成的打印圖片-->");
LoganManager.w_printer(TAG, "生成的打印圖片->");
PrinterFileUtils.savePrinterBitmapByType(orderType, printType, directoryName, bitmaps);
}
......@@ -370,7 +370,7 @@ public class GsaCloudApplication extends BaseApplication {
@Override
public void connectionBefore(String deviceName, String ip, int port, long ioTimeout, long printTimeout) {
Object[] objs = {deviceName, ip, port, ioTimeout, printTimeout};
LoganManager.w_printer(TAG, String.format("連接打印機前--> deviceName=%s ,IP=%s ,port=%s ,ioTimeout=%s ,printTimeout=%s", objs));
LoganManager.w_printer(TAG, String.format("連接打印機前-> deviceName=%s ,IP=%s ,port=%s ,ioTimeout=%s ,printTimeout=%s", objs));
}
@Override
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/config/LoganConfig.java
......@@ -15,6 +15,7 @@ public class LoganConfig {
public static final String EncryptIV16 = "0123456789012345";
public static final String APP_ID = "gingersoft1008611";
public static final String UPLOAD_LOG_URL = HttpsConstans.HTTP_ADDRESS_URL_HK+ "/logan-web/logan/upload.json";
// public static final String UPLOAD_LOG_URL = "http://192.168.1.131:8080/logan-web/logan/upload.json";
/**
* 日誌保留天數
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/config/globalconfig/applyOptions/intercept/HeadersInterceptor.java
......@@ -34,7 +34,7 @@ public class HeadersInterceptor implements Interceptor {
String deviceId = DeviceID.getDeviceId();
if (deviceId != null) {
builder.set("deviceId", DeviceID.getDeviceId());
builder.set("deviceId", deviceId);
}
Headers headers = originalRequest.headers();
for (int i = 0; i < headers.size(); i++) {
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/logan/LoganManager.java
......@@ -62,37 +62,69 @@ public class LoganManager {
/*******************************自定義業務日誌類型**************************************/
private static final String LOGIN_BUSINESS_TAG = "login-> ";
private static final String HOME_BUSINESS_TAG = "home-> ";
private static final String DATABASE_BUSINESS_TAG = "database-> ";
private static final String PRINTER_BUSINESS_TAG = "printer-> ";
private static final String TABLEMODE_BUSINESS_TAG = "tableMode-> ";
private static final String ORDER_BUSINESS_TAG = "order-> ";
private static final String PAY_BUSINESS_TAG = "pay-> ";
public static void w_database(String TAG, String log) {
Logan.w(DATABASE_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
if (BuildConfig.DEBUG) {
printLog(TAG, log);
}
/*******************************交互事件類型**************************************/
public static final String EVENT_CLICK = "點擊->";
public static final String EVENT_LONG_CLICK = "長按->";
public static final String EVENT_SELECTED = "選中->";
public static final String EVENT_TOUCH = "觸摸->";
public static final String EVENT_SCOLL = "滑動->";
public static final String EVENT_RETRY = "重試加載->";
public static final String EVENT_PULL_DOWN = "下拉刷新->";
public static final String EVENT_PULL_UP = "上拉加載->";
/*******************************業務事件類型**************************************/
public static final String EVENT_CALCULATE = "計算->";
public static final String EVENT_ADD = "添加->";
public static final String EVENT_DELETE = "刪除->";
public static final String EVENT_MODIFY = "修改->";
public static final String EVENT_QUERY = "查詢->";
public static void w_login(String TAG,String... eventAndLog) {
w_business(LOGIN_BUSINESS_TAG, TAG, eventAndLog);
}
public static void w_printer(String TAG, String log) {
Logan.w(PRINTER_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
public static void w_home(String TAG,String... eventAndLog) {
w_business(HOME_BUSINESS_TAG, TAG, eventAndLog);
}
public static void w_tableMode(String TAG, String log) {
Logan.w(TABLEMODE_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
public static void w_database(String TAG,String... eventAndLog) {
w_business(DATABASE_BUSINESS_TAG, TAG, eventAndLog);
}
public static void w_order(String TAG, String log) {
Logan.w(ORDER_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
public static void w_printer(String TAG, String... eventAndLog) {
w_business(PRINTER_BUSINESS_TAG, TAG, eventAndLog);
}
public static void w_pay(String TAG, String log) {
Logan.w(PAY_BUSINESS_TAG + log, LoganConfig.CODE_LEVLE);
printLog(TAG, log);
public static void w_tableMode(String TAG, String... eventAndLog) {
w_business(TABLEMODE_BUSINESS_TAG, TAG, eventAndLog);
}
public static void w_order(String TAG, String... eventAndLog) {
w_business(ORDER_BUSINESS_TAG, TAG, eventAndLog);
}
public static void w_pay(String TAG, String... eventAndLog) {
w_business(PAY_BUSINESS_TAG, TAG, eventAndLog);
}
private static void w_business(String BUSINESS_TAG, String TAG, String... eventAndLog) {
if (eventAndLog != null) {
if (eventAndLog.length > 1) {
Logan.w(BUSINESS_TAG + eventAndLog[0] + eventAndLog[1], LoganConfig.CODE_LEVLE);
printLog(TAG, eventAndLog[0] + eventAndLog[1]);
} else {
Logan.w(BUSINESS_TAG + eventAndLog[0], LoganConfig.CODE_LEVLE);
printLog(TAG, eventAndLog[0]);
}
}
}
private static void printLog(String TAG, String log) {
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/printer/PrinterFileUtils.java
package com.gingersoft.gsa.cloud.common.printer;
import android.graphics.Bitmap;
import android.os.Environment;
import android.text.TextUtils;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.FileUtils;
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/FileUtils.java
......@@ -63,38 +63,6 @@ public class FileUtils {
public final static String ERRORLOG_PATH = LOG_PATH + ErrorLog + File.separator;
public final static String APK_PATH = Environment.getExternalStorageDirectory() + File.separator + APK + File.separator;
/**
* 打印前圖片存儲路徑
*/
// public final static class PrinterImagePath {
// //Prj圖片文件最大文件大小不能超過100M
// public static final int PRINTER_MAX_FILE_SIZE = 100 * 1024 * 1024;
// //Prj最少保留文件大小
// public static final int PRINTER_KEEP_FILE_SIZE = 20 * 1024 * 1024;
//
// public static String PrinterImagesRootPath = "PrinterImages";
// public static String KitchenImage = "KitchenImages";
// public static String PrintOrderImage = "PrintOrderImages";
// public static String BillImage = "BillImages";
// public static String ServingPaperImage = "ServingPaperImages";
// public static String DeliveryPrintOrderImage = "DeliveryPrintOrderImages";
// public static String DeliveryBillImage = "DeliveryBillImages";
// public static String QrcodeImage = "QrcodeImages";
// public static String SettlementImage = "SettlementImages";
//
// public final static String ROOT_PATH = ALBUM_PATH + PrinterImagesRootPath + File.separator;
// public final static String KITCHEN_PRJ_IMAGE_PATH = ROOT_PATH + KitchenImage + File.separator;
// public final static String PRINT_ORDER_IMAGE_PATH = ROOT_PATH + PrintOrderImage + File.separator;
// public final static String BILL_IMAGE_PATH = ROOT_PATH + BillImage + File.separator;
// public final static String SERVING_PAPER_IMAGE_PATH = ROOT_PATH + ServingPaperImage + File.separator;
// public final static String DELIVERY_PRINT_ORDER_IMAGE_PATH = ROOT_PATH + DeliveryPrintOrderImage + File.separator;
// public final static String DELIVERY_BILL_IMAGE_PATH = ROOT_PATH + DeliveryBillImage + File.separator;
// public final static String QRCODE_IMAGE_PATH = ROOT_PATH + QrcodeImage + File.separator;
// public final static String SETTLEMENT_IMAGE_PATH = ROOT_PATH + SettlementImage + File.separator;
// }
public final static String FILE_EXTENSION_SEPARATOR = ".";
//操作日志單最大文件大小
public final static int ACTION_MAX_SIZE = 1024 * 1024 * 5;
//操作日志文件按照時間刪除
......@@ -246,7 +214,6 @@ public class FileUtils {
inStream.close();
return outStream.toString();
} catch (IOException e) {
XLog.tag("FileTest").d(e.getMessage());
}
return null;
}
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/crash/AppCrashHandler.java
......@@ -234,13 +234,11 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
LogUtil.d(TAG, "delete result : " + delete);
}
}
XLog.d(TAG, "sendFileMultipart onNext: " + data);
}
}
@Override
public void onError(Throwable t) {
XLog.d(TAG, "sendFileMultipart onError: " + t.getMessage());
}
@Override
......
library-common/src/main/res/values-v21/styles.xml
......@@ -12,4 +12,10 @@
<item name="android:colorControlNormal">@color/theme_color</item>
<item name="android:colorControlActivated">@color/color_c9</item>
</style>
<style name="SliderStyle" parent="Theme.MaterialComponents.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
</style>
</resources>
\ No newline at end of file
library-common/src/main/res/values/styles.xml
......@@ -14,11 +14,6 @@
<item name="android:backgroundDimEnabled">true</item><!--背景遮罩效果-->
</style>
<!-- <style name="AppTheme" parent="PublicTheme">-->
<!-- <item name="QMUITopBarStyle">@style/QDTopBar</item>-->
<!-- <item name="QMUITabSegmentStyle">@style/QMUITabSegmentStyle</item>-->
<!-- </style>-->
<style name="PublicTheme" parent="QMUI.Compat.NoActionBar">
......@@ -151,17 +146,16 @@
<style name="QMUITabSegmentStyle" parent="QMUI.TabSegment">
<item name="qmui_skin_support_tab_bg">@color/qmui_config_color_white</item>
<item name="qmui_skin_support_tab_separator_color">?attr/qmui_skin_support_color_separator
</item>
<item name="qmui_skin_support_tab_separator_color">?attr/qmui_skin_support_color_separator</item>
<item name="qmui_skin_support_tab_normal_color">@color/normal_color</item>
<item name="qmui_skin_support_tab_selected_color">@color/theme_color</item>
<item name="qmui_skin_support_tab_sign_count_view_text_color">
@color/qmui_config_color_white
</item>
<item name="qmui_skin_support_tab_sign_count_view_bg_color">?attr/qmui_config_color_red
</item>
<item name="qmui_skin_support_tab_sign_count_view_text_color">@color/qmui_config_color_white</item>
<item name="qmui_skin_support_tab_sign_count_view_bg_color">?attr/qmui_config_color_red</item>
</style>
<attr name="MaterialComponentsStyle" format="reference"/>
<style name="MaterialComponentsStyle" parent="Widget.MaterialComponents.Slider"/>
<style name="QDRoundButtonStyle" parent="@style/Button.Compat">
<item name="android:layout_height">40dp</item>
<item name="android:layout_width">wrap_content</item>
......
library-print/src/main/java/com/gingersoft/gsa/cloud/print/PrintSocketHolder.java
......@@ -18,13 +18,10 @@ package com.gingersoft.gsa.cloud.print;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
import com.elvishew.xlog.XLog;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.printer.plugins.PrinterPlugins;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.ref.WeakReference;
......
library-ui/src/main/java/com/gingersoft/gsa/cloud/ui/view/OrderPayView.java
......@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.VibratorUtils;
......@@ -31,6 +32,7 @@ import java.util.List;
public class OrderPayView extends LinearLayout {
private final String TAG = this.getClass().getSimpleName();
private Context mContext;
/**
......@@ -217,6 +219,7 @@ public class OrderPayView extends LinearLayout {
@Override
public void onItemClick(PayMethod datasBean, int position) {
LoganManager.w_pay(TAG, LoganManager.EVENT_CLICK, "支付方式=" + datasBean.getPayName());
recordOperat(context);
mBillMoneyAdapter.setSelect_position(position);
mBillMoneyAdapter.notifyDataSetChanged();
......@@ -246,6 +249,7 @@ public class OrderPayView extends LinearLayout {
//Exact
view.findViewById(R.id.btn_exact).setOnClickListener(v -> {
LoganManager.w_pay(TAG, LoganManager.EVENT_CLICK, "Exact");
PayMethod selectPayMethod = getSelectBillMoney();
if (selectPayMethod == null) {
ToastUtils.show(context, "請選擇支付方式");
......@@ -260,6 +264,7 @@ public class OrderPayView extends LinearLayout {
//sure
view.findViewById(R.id.btn_sure_pay).setOnClickListener(v -> {
LoganManager.w_pay(TAG, LoganManager.EVENT_CLICK, "確認支付");
if (mBillMoneyList.size() == 0) {
ToastUtils.show(context, "請選擇支付方式");
return;
......@@ -275,6 +280,7 @@ public class OrderPayView extends LinearLayout {
//Keypad
view.findViewById(R.id.layout_keypad).setOnClickListener(v -> {
LoganManager.w_pay(TAG, LoganManager.EVENT_CLICK, "Keypad");
PayMethod payMethod = getSelectBillMoney();
if (payMethod == null) {
ToastUtils.show(context, "請選擇支付方式");
......@@ -625,7 +631,7 @@ public class OrderPayView extends LinearLayout {
public void makeUpDifference() {
//補齊差價
double difference = getDifferenceMoney();
if(difference > 0) {
if (difference > 0) {
method.setPayMoney(difference);
mBillMoneyAdapter.notifyDataSetChanged();
setDifferenceText(context);
......
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