Skip to content

S
supplier
Commit 20ed4383 by 宁斌
Options

base-mode拆分

parent 3639ad20
Showing with 640 additions and 520 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/MemberInfoUtils.java deleted 100644 → 0
package com.gingersoft.gsa.cloud.base.utils;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-03-12
* 修订历史：2020-03-12
* 描述：
*/
public class MemberInfoUtils {
/**
* 獲取消費前積分
*
* @return
*/
private double getLastPoint() {
double LastPoint = 0.0;
if (hasUseMember()) {
LastPoint = MyOrderManage.getInstance().getMemberInfo().getMemberPoint();
}
return LastPoint;
}
/**
* 是否有使用會員
*
* @return
*/
public boolean hasUseMember() {
if (MyOrderManage.getInstance().getMemberInfo() != null) {
return true;
}
return false;
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionManager.java
...@@ -73,22 +73,4 @@ public class FunctionManager { ...@@ -73,22 +73,4 @@ public class FunctionManager {
return functions; return functions;
} }
private static boolean ready;
private static int number;
private static class ReaderThread extends Thread {
@Override
public void run() {
while (!ready) {
Thread.yield();
}
System.out.println(number);
}
}
public static void main(String[] args) {
new ReaderThread().start();
number = 42;
ready = true;
}
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java
...@@ -4,12 +4,9 @@ import android.app.Activity; ...@@ -4,12 +4,9 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.net.ParseException; import android.net.ParseException;
import android.text.TextUtils; import android.text.TextUtils;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.google.gson.JsonIOException; import com.google.gson.JsonIOException;
...@@ -17,12 +14,9 @@ import com.google.gson.JsonParseException; ...@@ -17,12 +14,9 @@ import com.google.gson.JsonParseException;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import org.json.JSONException; import org.json.JSONException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import me.jessyan.rxerrorhandler.handler.listener.ResponseErrorListener; import me.jessyan.rxerrorhandler.handler.listener.ResponseErrorListener;
import retrofit2.HttpException; import retrofit2.HttpException;
import timber.log.Timber; import timber.log.Timber;
...@@ -103,12 +97,14 @@ public class MyResponseErrorListener implements ResponseErrorListener { ...@@ -103,12 +97,14 @@ public class MyResponseErrorListener implements ResponseErrorListener {
ArmsUtils.killAll(); ArmsUtils.killAll();
//清空用戶信息 //清空用戶信息
GsaCloudApplication.clearMemberInfo(); GsaCloudApplication.clearMemberInfo();
//清空賬單數據
MyOrderManage.getInstance().clear();
//清空開檯數據
OpenTableManage.getDefault().clear();
//修改登錄狀態 //修改登錄狀態
GsaCloudApplication.isLogin = false; GsaCloudApplication.isLogin = false;
//清空堂食訂單信息
CC.obtainBuilder("Component.Base.Order")
.setActionName("clearDoshokuOrder")
.build()
.call();
//跳轉登錄頁面
CC.obtainBuilder("User.Component.Login") CC.obtainBuilder("User.Component.Login")
.setActionName("showActivityA") .setActionName("showActivityA")
.build() .build()
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/lifecyclesOptioins/MyActivityLifecycle.java
...@@ -5,13 +5,17 @@ import android.app.Activity; ...@@ -5,13 +5,17 @@ import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.os.Bundle; import android.os.Bundle;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration; import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration;
import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils; import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils; import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.schedulers.Schedulers;
@SuppressLint("NewApi") @SuppressLint("NewApi")
public class MyActivityLifecycle implements Application.ActivityLifecycleCallbacks { public class MyActivityLifecycle implements Application.ActivityLifecycleCallbacks {
...@@ -36,22 +40,31 @@ public class MyActivityLifecycle implements Application.ActivityLifecycleCallbac ...@@ -36,22 +40,31 @@ public class MyActivityLifecycle implements Application.ActivityLifecycleCallbac
public void onActivityResumed(Activity activity) { public void onActivityResumed(Activity activity) {
String name = activity.getClass().getSimpleName(); String name = activity.getClass().getSimpleName();
if (name.equals("NewMainActivity")) { if (name.equals("NewMainActivity")) {
Observable.create(new ObservableOnSubscribe<Void>() {
@Override
public void subscribe(ObservableEmitter<Void> emitter) throws Exception {
//每次到首頁都更新食品套餐，細項對應ID備用 //每次到首頁都更新食品套餐，細項對應ID備用
FoodComboDaoUtils foodComboDaoUtils = new FoodComboDaoUtils(activity); FoodComboDaoUtils foodComboDaoUtils = new FoodComboDaoUtils(activity);
CommonConfiguration.getInstance().saveComboIdConfiguration(foodComboDaoUtils.queryAllCombo()); CommonConfiguration.getInstance().saveComboIdConfiguration(foodComboDaoUtils.queryAllCombo());
ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(activity); ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(activity);
CommonConfiguration.getInstance().saveModifierTopIdConfiguration(modifierDaoUtils.queryAllModifier()); CommonConfiguration.getInstance().saveModifierTopIdConfiguration(modifierDaoUtils.queryAllModifier());
}
}).subscribeOn(Schedulers.io()).subscribe();
} else if (name.equals("TableActivity")) { } else if (name.equals("TableActivity")) {
//清空賬單數據 //清空堂食訂單信息
MyOrderManage.getInstance().clear(); CC.obtainBuilder("Component.Base.Order")
//清空開檯數據 .setActionName("clearDoshokuOrder")
OpenTableManage.getDefault().clear(); .build()
.call();
} else if (name.equals("OrderCenterActivity") || name.equals("OrderDetailActivity")) { } else if (name.equals("OrderCenterActivity") || name.equals("OrderDetailActivity")) {
//清空賬單數據 //清空堂食訂單信息
MyOrderManage.getInstance().clear(); CC.obtainBuilder("Component.Base.Order")
//清空開檯數據 .setActionName("clearDoshokuOrder")
OpenTableManage.getDefault().clear(); .build()
.call();
} }
GsaCloudApplication.getAppContext().setCurrentActivity(activity); GsaCloudApplication.getAppContext().setCurrentActivity(activity);
} }
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/bean/view/SectionTextItem3.java
package com.gingersoft.gsa.cloud.ui.bean.view; package com.gingersoft.gsa.cloud.ui.bean.view;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import java.util.ArrayList;
import java.util.List;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
...@@ -81,43 +76,29 @@ public class SectionTextItem3 { ...@@ -81,43 +76,29 @@ public class SectionTextItem3 {
this.rightTextStyle = rightTextStyle; this.rightTextStyle = rightTextStyle;
} }
public static List<SectionTextItem3> orderDetailTransSectionTextItem3(List<OrderDetail> orderDetailList) { // public static List<SectionTextItem3> orderDetailTransSectionTextItem3(List<OrderDetail> orderDetailList) {
List<SectionTextItem3> sectionTextItem3List = new ArrayList<>(); // List<SectionTextItem3> sectionTextItem3List = new ArrayList<>();
for (OrderDetail orderDetail : orderDetailList) { // for (OrderDetail orderDetail : orderDetailList) {
SectionTextItem3 sectionTextItem3 = new SectionTextItem3(); // SectionTextItem3 sectionTextItem3 = new SectionTextItem3();
String foodName; // String foodName;
switch (orderDetail.getItemType()) { // switch (orderDetail.getItemType()) {
case 2: // case 2:
foodName = " " + orderDetail.getProductName(); // foodName = " " + orderDetail.getProductName();
break; // break;
case 3: // case 3:
foodName = " " + orderDetail.getProductName(); // foodName = " " + orderDetail.getProductName();
break; // break;
default: // default:
foodName = orderDetail.getProductName(); // foodName = orderDetail.getProductName();
break; // break;
} // }
sectionTextItem3.setLeftText(foodName); // sectionTextItem3.setLeftText(foodName);
sectionTextItem3.setCenterText(String.valueOf(orderDetail.getNumber())); // sectionTextItem3.setCenterText(String.valueOf(orderDetail.getNumber()));
sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice())); // sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice()));
sectionTextItem3List.add(sectionTextItem3); // sectionTextItem3List.add(sectionTextItem3);
} // }
return sectionTextItem3List; // return sectionTextItem3List;
} // }
public static List<SectionTextItem3> orderPayMethodTransSectionTextItem3(List<PayMethod> payMethodList) {
List<SectionTextItem3> sectionTextItem3List = new ArrayList<>();
for (PayMethod payMethod : payMethodList) {
SectionTextItem3 sectionTextItem3 = new SectionTextItem3();
sectionTextItem3.setLeftText(payMethod.getPayName());
sectionTextItem3.setCenterText(String.valueOf(0));
sectionTextItem3.setRightText(String.valueOf(payMethod.getPayMoney()));
sectionTextItem3.setLeftTextStyle(R.style.order_paymethod_text_style);
sectionTextItem3.setRightTextStyle(R.style.order_paymethod_text_style);
sectionTextItem3List.add(sectionTextItem3);
}
return sectionTextItem3List;
}
public static SectionTextItem3 roundingTransSectionTextItem3(double amuout) { public static SectionTextItem3 roundingTransSectionTextItem3(double amuout) {
SectionTextItem3 sectionTextItem3 = new SectionTextItem3(); SectionTextItem3 sectionTextItem3 = new SectionTextItem3();
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/recylcler/event/RecyItemTouchHelperCallback.java
package com.gingersoft.gsa.cloud.ui.recylcler.event; package com.gingersoft.gsa.cloud.ui.recylcler.event;
import android.graphics.Color; import android.graphics.Color;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.qmuiteam.qmui.widget.section.QMUIDefaultStickySectionAdapter; import com.qmuiteam.qmui.widget.section.QMUIDefaultStickySectionAdapter;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter; import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
...@@ -26,7 +21,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -26,7 +21,7 @@ import androidx.recyclerview.widget.RecyclerView;
public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T extends QMUISection.Model<T>> extends ItemTouchHelper.Callback { public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T extends QMUISection.Model<T>> extends ItemTouchHelper.Callback {
private final String TAG = getClass().getSimpleName(); private final String TAG = getClass().getSimpleName();
RecyclerView.Adapter mAdapter; private RecyclerView.Adapter mAdapter;
boolean isSwipeEnable; boolean isSwipeEnable;
boolean isFirstDragUnable; boolean isFirstDragUnable;
...@@ -72,10 +67,12 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten ...@@ -72,10 +67,12 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten
int fromIndex = sectionAdapter.getItemIndex(fromPosition); int fromIndex = sectionAdapter.getItemIndex(fromPosition);
int toIndex = sectionAdapter.getItemIndex(toPosition); int toIndex = sectionAdapter.getItemIndex(toPosition);
if(toIndex < 0 || fromIndex < 0) if (toIndex < 0 || fromIndex < 0) {
return false; return false;
if ((fromIndex + 1) == list.size()) }
if ((fromIndex + 1) == list.size()) {
return false; return false;
}
for (int i = fromIndex; i < toIndex; i++) { for (int i = fromIndex; i < toIndex; i++) {
Collections.swap(list, i, i + 1); Collections.swap(list, i, i + 1);
...@@ -95,10 +92,12 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten ...@@ -95,10 +92,12 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten
int fromIndex = sectionAdapter.getItemIndex(fromPosition); int fromIndex = sectionAdapter.getItemIndex(fromPosition);
int toIndex = sectionAdapter.getItemIndex(toPosition); int toIndex = sectionAdapter.getItemIndex(toPosition);
if(toIndex < 0 || fromIndex < 0) if (toIndex < 0 || fromIndex < 0) {
return false; return false;
if ((fromIndex + 1) == list.size()) }
if ((fromIndex + 1) == list.size()) {
return false; return false;
}
for (int i = fromIndex; i > toIndex; i--) { for (int i = fromIndex; i > toIndex; i--) {
Collections.swap(list, i, i - 1); Collections.swap(list, i, i - 1);
...@@ -136,50 +135,10 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten ...@@ -136,50 +135,10 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten
public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) { public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
super.clearView(recyclerView, viewHolder); super.clearView(recyclerView, viewHolder);
viewHolder.itemView.setBackgroundColor(Color.WHITE); viewHolder.itemView.setBackgroundColor(Color.WHITE);
String ids = "";
if (mAdapter instanceof QMUIStickySectionAdapter) {
QMUIStickySectionAdapter adapter = (QMUIStickySectionAdapter) mAdapter;
List<QMUISection<H, T>> qmuiSectionList = adapter.getCurrentData();
ids = getTableIds(qmuiSectionList);
} else {
DefaultAdapter adapter = (DefaultAdapter) mAdapter;
ids = getTableAreaIds(adapter.getInfos());
}
// mAdapter.notifyDataSetChanged(); // mAdapter.notifyDataSetChanged();
if (onMoveListener != null) { if (onMoveListener != null) {
onMoveListener.onMoveFinish(ids); onMoveListener.onMoveFinish(mAdapter);
}
}
private String getTableIds(List<QMUISection<H, T>> qmuiSectionList) {
StringBuilder builder = new StringBuilder();
for (QMUISection<H, T> qmuiSections : qmuiSectionList) {
for (T t : qmuiSections.getItemList()) {
TableItem tableItem = (TableItem) t;
if (tableItem.getLayoutType() == 0) {
builder.append(tableItem.getId());
builder.append(",");
}
}
}
String str = builder.toString();
if (str.endsWith(",")) {
str = str.substring(0, str.length() - 1);
}
return str;
}
private String getTableAreaIds(List<TableArea> tableAreaList) {
StringBuilder builder = new StringBuilder();
for (TableArea tableArea : tableAreaList) {
builder.append(tableArea.getId());
builder.append(",");
}
String str = builder.toString();
if (str.endsWith(",")) {
str = str.substring(0, str.length() - 1);
} }
return str;
} }
@Override @Override
...@@ -199,6 +158,6 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten ...@@ -199,6 +158,6 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten
} }
public interface onMoveListener { public interface onMoveListener {
void onMoveFinish(String ids); void onMoveFinish(RecyclerView.Adapter adapter);
} }
} }
\ No newline at end of file
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/OrderPayView.java
...@@ -6,11 +6,9 @@ import android.view.LayoutInflater; ...@@ -6,11 +6,9 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo; import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod; import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.LanguageUtils; import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.VibratorUtils; import com.gingersoft.gsa.cloud.base.utils.VibratorUtils;
...@@ -19,10 +17,8 @@ import com.gingersoft.gsa.cloud.ui.adapter.BillMethodAdapter; ...@@ -19,10 +17,8 @@ import com.gingersoft.gsa.cloud.ui.adapter.BillMethodAdapter;
import com.gingersoft.gsa.cloud.ui.adapter.BillMoneyAdapter; import com.gingersoft.gsa.cloud.ui.adapter.BillMoneyAdapter;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
public class OrderPayView extends LinearLayout { public class OrderPayView extends LinearLayout {
...@@ -47,6 +43,8 @@ public class OrderPayView extends LinearLayout { ...@@ -47,6 +43,8 @@ public class OrderPayView extends LinearLayout {
*/ */
private double serviceCharge = 0.0; private double serviceCharge = 0.0;
private MemberInfo memberInfo;
private TextView tvDifferenceName; private TextView tvDifferenceName;
private TextView tvDifferenceMoney; private TextView tvDifferenceMoney;
private TextView btn_order_count; private TextView btn_order_count;
...@@ -85,6 +83,10 @@ public class OrderPayView extends LinearLayout { ...@@ -85,6 +83,10 @@ public class OrderPayView extends LinearLayout {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
} }
public void setMemberInfo(MemberInfo memberInfo) {
this.memberInfo = memberInfo;
}
public void setTotalAmount(double totalAmount) { public void setTotalAmount(double totalAmount) {
this.totalAmount = totalAmount; this.totalAmount = totalAmount;
} }
...@@ -128,7 +130,6 @@ public class OrderPayView extends LinearLayout { ...@@ -128,7 +130,6 @@ public class OrderPayView extends LinearLayout {
boolean isIntegralPayMethod = isIntegralPayMethod(method); boolean isIntegralPayMethod = isIntegralPayMethod(method);
if (isIntegralPayMethod) { if (isIntegralPayMethod) {
//積分支付 //積分支付
MemberInfo memberInfo = MyOrderManage.getInstance().getMemberInfo();
if (memberInfo == null) { if (memberInfo == null) {
//提示沒有登錄會員 不能使用積分支付 //提示沒有登錄會員 不能使用積分支付
showTipWord(LanguageUtils.get_language_system(context, "member.not.logged.cannot.be.used", "會員尚未登錄,不能使用") + method.getPayName()); showTipWord(LanguageUtils.get_language_system(context, "member.not.logged.cannot.be.used", "會員尚未登錄,不能使用") + method.getPayName());
...@@ -333,7 +334,6 @@ public class OrderPayView extends LinearLayout { ...@@ -333,7 +334,6 @@ public class OrderPayView extends LinearLayout {
boolean isIntegralPayMethod = isIntegralPayMethod(billMoneyBean); boolean isIntegralPayMethod = isIntegralPayMethod(billMoneyBean);
if (isIntegralPayMethod) { if (isIntegralPayMethod) {
//積分支付 //積分支付
MemberInfo memberInfo = MyOrderManage.getInstance().getMemberInfo();
if (!setIntergralPayMoney(billMoneyBean, memberInfo.getMemberPoint(), memberInfo.getPointRedeemCash(), differenceMoney)) { if (!setIntergralPayMoney(billMoneyBean, memberInfo.getMemberPoint(), memberInfo.getPointRedeemCash(), differenceMoney)) {
return; return;
} }
......
cc-settings.gradle
...@@ -12,6 +12,13 @@ dependencies { ...@@ -12,6 +12,13 @@ dependencies {
if (project.name != 'base-module' && project.name != 'arms' && project.name != 'fragmentation_core' && project.name != 'qm-qmui' && project.name != 'qm-arch' && project.name != 'qm-skin-maker') { if (project.name != 'base-module' && project.name != 'arms' && project.name != 'fragmentation_core' && project.name != 'qm-qmui' && project.name != 'qm-arch' && project.name != 'qm-skin-maker') {
api project(':base-module') api project(':base-module')
} }
if (project.name != 'base-module' && project.name != 'table-base' && (project.name == 'table-module' || project.name == 'manager-module' || project.name == 'order-base')) {
api project(':table-base')
}
if (project.name != 'base-module' && project.name != 'order-base' && (project.name == 'table-module' || project.name == 'print-module' ||
project.name == 'coldchain-module'|| project.name == 'delivery_pick_module' || project.name == 'order-advance-module')) {
api project(':order-base')
}
if (project.name != 'arms' && project.name != 'fragmentation_core' && project.name != 'qm-qmui' && project.name != 'qm-arch' && project.name != 'qm-skin-maker') { if (project.name != 'arms' && project.name != 'fragmentation_core' && project.name != 'qm-qmui' && project.name != 'qm-arch' && project.name != 'qm-skin-maker') {
api project(':arms') api project(':arms')
} }
......
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/fragment/OrderListFragment.java
...@@ -7,13 +7,11 @@ import android.view.LayoutInflater; ...@@ -7,13 +7,11 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.coldchain_module.R; import com.gingersoft.coldchain_module.R;
import com.gingersoft.coldchain_module.R2; import com.gingersoft.coldchain_module.R2;
import com.gingersoft.coldchain_module.di.component.DaggerOrderListComponent; import com.gingersoft.coldchain_module.di.component.DaggerOrderListComponent;
......
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 : 8, versionCode : 8,
versionName : "1.0.82" versionName : "1.0.8"
] ]
version = [ version = [
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/HistoryOrderViewModel.kt
...@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModel ...@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.constans.PrintConstans import com.gingersoft.gsa.cloud.constans.PrintConstans
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt
...@@ -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.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod import com.gingersoft.gsa.cloud.base.common.bean.PayMethod
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils
import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil import com.gingersoft.gsa.cloud.base.utils.other.TextUtil
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementActivity.java
...@@ -4,11 +4,9 @@ import android.content.Intent; ...@@ -4,11 +4,9 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
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 androidx.core.content.ContextCompat;
import com.gingersoft.gsa.cloud.base.utils.LanguageUtils; import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
...@@ -12,7 +12,6 @@ import android.widget.RadioGroup; ...@@ -12,7 +12,6 @@ import android.widget.RadioGroup;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.SimpleAdapter; import android.widget.SimpleAdapter;
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 androidx.core.content.ContextCompat;
...@@ -20,7 +19,6 @@ import androidx.core.widget.NestedScrollView; ...@@ -20,7 +19,6 @@ import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod; import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
...@@ -52,20 +50,15 @@ import com.jess.arms.utils.DeviceUtils; ...@@ -52,20 +50,15 @@ import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
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 javax.inject.Inject; import javax.inject.Inject;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/contract/TableListContract.java
package com.gingersoft.gsa.cloud.manager.mvp.contract; package com.gingersoft.gsa.cloud.manager.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
import com.jess.arms.mvp.IView;
import java.util.List; import java.util.List;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/contract/TableManageContract.java
package com.gingersoft.gsa.cloud.manager.mvp.contract; package com.gingersoft.gsa.cloud.manager.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea; import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
import com.jess.arms.mvp.IView;
import java.util.List; import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
import okhttp3.RequestBody; import okhttp3.RequestBody;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/AddAreaPresenter.java
...@@ -2,17 +2,15 @@ package com.gingersoft.gsa.cloud.manager.mvp.presenter; ...@@ -2,17 +2,15 @@ package com.gingersoft.gsa.cloud.manager.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.jess.arms.integration.AppManager; import com.gingersoft.gsa.cloud.manager.mvp.contract.AddAreaContract;
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 me.jessyan.rxerrorhandler.core.RxErrorHandler; import com.jess.arms.mvp.BasePresenter;
import javax.inject.Inject; import javax.inject.Inject;
import com.gingersoft.gsa.cloud.manager.mvp.contract.AddAreaContract; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
/** /**
* ================================================ * ================================================
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableListPresenter.java
package com.gingersoft.gsa.cloud.manager.mvp.presenter; package com.gingersoft.gsa.cloud.manager.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea; import com.gingersoft.gsa.cloud.manager.mvp.contract.TableListContract;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader; import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;
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 me.jessyan.rxerrorhandler.core.RxErrorHandler; import com.jess.arms.mvp.BasePresenter;
import javax.inject.Inject;
import com.gingersoft.gsa.cloud.manager.mvp.contract.TableListContract;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import javax.inject.Inject;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
/** /**
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableManagePresenter.java
...@@ -2,22 +2,28 @@ package com.gingersoft.gsa.cloud.manager.mvp.presenter; ...@@ -2,22 +2,28 @@ package com.gingersoft.gsa.cloud.manager.mvp.presenter;
import android.app.Application; import android.app.Application;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.constans.GoldConstants; import com.gingersoft.gsa.cloud.constans.GoldConstants;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea; import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.jess.arms.integration.AppManager;
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 com.jess.arms.utils.RxLifecycleUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import java.util.List;
import javax.inject.Inject;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull; import io.reactivex.annotations.NonNull;
...@@ -29,14 +35,6 @@ import okhttp3.FormBody; ...@@ -29,14 +35,6 @@ import okhttp3.FormBody;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import javax.inject.Inject;
import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
import com.jess.arms.utils.RxLifecycleUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import java.util.List;
/** /**
* ================================================ * ================================================
...@@ -61,7 +59,6 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -61,7 +59,6 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
@Inject @Inject
AppManager mAppManager; AppManager mAppManager;
//定时获取餐台 定时器
private GetTableTimer tableTimer; private GetTableTimer tableTimer;
private Disposable mGetTablesDataDisposable; private Disposable mGetTablesDataDisposable;
...@@ -431,19 +428,6 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -431,19 +428,6 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
}); });
} }
private String getTableIds() {
StringBuilder builder = new StringBuilder();
for (TableItem tableItem : IActivity.getTableList()) {
builder.append(tableItem.getId());
builder.append(",");
}
String str = builder.toString();
if (str.endsWith(",")) {
str = str.substring(0, str.length() - 1);
}
return str;
}
public void updateTableServiceCharge(List<TableRequest.UpdateServiceCharge> request) { public void updateTableServiceCharge(List<TableRequest.UpdateServiceCharge> request) {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request));
String json = GsonUtils.GsonString(request); String json = GsonUtils.GsonString(request);
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/activity/TableManageActivity.java
...@@ -2,11 +2,14 @@ package com.gingersoft.gsa.cloud.manager.mvp.ui.activity; ...@@ -2,11 +2,14 @@ package com.gingersoft.gsa.cloud.manager.mvp.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.di.component.DaggerTableManageComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.TableManagePresenter;
import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AddTableFragment; import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AddTableFragment;
import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AreaListFragment; import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AreaListFragment;
import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.TableListFragment; import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.TableListFragment;
...@@ -14,14 +17,8 @@ import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; ...@@ -14,14 +17,8 @@ import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseFragmentActivity; import com.jess.arms.base.BaseFragmentActivity;
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.gingersoft.gsa.cloud.manager.di.component.DaggerTableManageComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.TableManagePresenter;
import com.gingersoft.gsa.cloud.manager.R;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/adapter/AreaManageAdapter.java
...@@ -5,10 +5,9 @@ import android.view.View; ...@@ -5,10 +5,9 @@ import android.view.View;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.EditText; import android.widget.EditText;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea;
import com.jess.arms.base.BaseHolder; import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/adapter/TableManageSectiontAdapter.java
...@@ -10,8 +10,7 @@ import android.widget.CompoundButton; ...@@ -10,8 +10,7 @@ import android.widget.CompoundButton;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem;
import com.gingersoft.gsa.cloud.base.utils.StringUtils; import com.gingersoft.gsa.cloud.base.utils.StringUtils;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddAreaFragment.java
...@@ -10,20 +10,19 @@ import android.widget.Button; ...@@ -10,20 +10,19 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.PopupWindow; import android.widget.PopupWindow;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea; import com.gingersoft.gsa.cloud.manager.di.component.DaggerAddAreaComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.AddAreaContract;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.AddAreaPresenter;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseFragment; import com.jess.arms.base.BaseFragment;
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.gingersoft.gsa.cloud.manager.di.component.DaggerAddAreaComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.AddAreaContract;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.AddAreaPresenter;
import com.gingersoft.gsa.cloud.manager.R;
import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.util.QMUIResHelper; import com.qmuiteam.qmui.util.QMUIResHelper;
import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.QMUITopBarLayout;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
...@@ -14,20 +14,19 @@ import android.widget.Button; ...@@ -14,20 +14,19 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.di.component.DaggerAddTableComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.AddTableContract;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.AddTablePresenter;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseFragment; import com.jess.arms.base.BaseFragment;
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.gingersoft.gsa.cloud.manager.di.component.DaggerAddTableComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.AddTableContract;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.AddTablePresenter;
import com.gingersoft.gsa.cloud.manager.R;
import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.util.QMUIResHelper; import com.qmuiteam.qmui.util.QMUIResHelper;
import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.QMUITopBarLayout;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AreaListFragment.java
...@@ -14,9 +14,13 @@ import android.widget.EditText; ...@@ -14,9 +14,13 @@ import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea; import com.gingersoft.gsa.cloud.manager.di.component.DaggerAreaListComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.AreaListContract;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.AreaListPresenter;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.AreaManageAdapter; import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.AreaManageAdapter;
import com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration; import com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration;
...@@ -30,12 +34,6 @@ import com.jess.arms.base.BaseFragment; ...@@ -30,12 +34,6 @@ import com.jess.arms.base.BaseFragment;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
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.gingersoft.gsa.cloud.manager.di.component.DaggerAreaListComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.AreaListContract;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.AreaListPresenter;
import com.gingersoft.gsa.cloud.manager.R;
import com.jess.arms.utils.KeyboardChangeHelper; import com.jess.arms.utils.KeyboardChangeHelper;
import com.qmuiteam.qmui.alpha.QMUIAlphaFrameLayout; import com.qmuiteam.qmui.alpha.QMUIAlphaFrameLayout;
import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.qmuiteam.qmui.widget.QMUIEmptyView;
...@@ -175,7 +173,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements ...@@ -175,7 +173,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
} }
private void initTopbar() { private void initTopbar() {
mTopBar.addLeftBackImageButton().setOnClickListener(v ->{ mTopBar.addLeftBackImageButton().setOnClickListener(v -> {
mAreaManageAdapter.addTextChangedListener(null); mAreaManageAdapter.addTextChangedListener(null);
killMyself(); killMyself();
}); });
...@@ -241,9 +239,30 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements ...@@ -241,9 +239,30 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
itemTouchHelperCallback.setOnMoveListener(new RecyItemTouchHelperCallback.onMoveListener() { itemTouchHelperCallback.setOnMoveListener(new RecyItemTouchHelperCallback.onMoveListener() {
@Override @Override
public void onMoveFinish(String ids) { public void onMoveFinish(RecyclerView.Adapter adapter) {
if (adapter instanceof DefaultAdapter) {
DefaultAdapter defaultAdapter = (DefaultAdapter) adapter;
if (defaultAdapter.getInfos() != null) {
String ids = getTableAreaIds(defaultAdapter.getInfos());
if (!TextUtils.isEmpty(ids)) {
mActivity.changeAreaSort(ids); mActivity.changeAreaSort(ids);
} }
}
}
}
private String getTableAreaIds(List<TableArea> tableAreaList) {
StringBuilder builder = new StringBuilder();
for (TableArea tableArea : tableAreaList) {
builder.append(tableArea.getId());
builder.append(",");
}
String str = builder.toString();
if (str.endsWith(",")) {
str = str.substring(0, str.length() - 1);
}
return str;
}
}); });
} }
...@@ -259,7 +278,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements ...@@ -259,7 +278,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
mAreaManageAdapter.addTextChangedListener(textChangedListener); mAreaManageAdapter.addTextChangedListener(textChangedListener);
} }
private AreaManageAdapter.OnTextChangedListener textChangedListener = new AreaManageAdapter.OnTextChangedListener(){ private AreaManageAdapter.OnTextChangedListener textChangedListener = new AreaManageAdapter.OnTextChangedListener() {
@Override @Override
public void afterTextChanged(TableArea datasBean, String s) { public void afterTextChanged(TableArea datasBean, String s) {
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java
...@@ -19,11 +19,14 @@ import android.widget.LinearLayout; ...@@ -19,11 +19,14 @@ 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.base.common.bean.table.TableItem; import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.di.component.DaggerTableListComponent; import com.gingersoft.gsa.cloud.manager.di.component.DaggerTableListComponent;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableArea; import com.gingersoft.gsa.cloud.manager.mvp.contract.TableListContract;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.TableListPresenter;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.TableManageSectiontAdapter; import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.TableManageSectiontAdapter;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader; import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;
...@@ -36,10 +39,6 @@ import com.google.gson.JsonParseException; ...@@ -36,10 +39,6 @@ import com.google.gson.JsonParseException;
import com.jess.arms.base.BaseFragment; import com.jess.arms.base.BaseFragment;
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.gingersoft.gsa.cloud.manager.mvp.contract.TableListContract;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.TableListPresenter;
import com.gingersoft.gsa.cloud.manager.R;
import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.qmuiteam.qmui.widget.QMUIEmptyView;
import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.QMUITopBarLayout;
...@@ -199,7 +198,6 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -199,7 +198,6 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
@Override @Override
public void setData(@Nullable Object data) { public void setData(@Nullable Object data) {
} }
private void initTopbar() { private void initTopbar() {
...@@ -271,7 +269,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -271,7 +269,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
item.setChecked(!item.isChecked()); item.setChecked(!item.isChecked());
mAdapter.notifyItemChanged(position); mAdapter.notifyItemChanged(position);
} else { } else {
if (item.getStatus() == 0) { if (item.getUseStatus() == 0 && item.getStatus() == 0) {
start(AddTableFragment.newInstance(item)); start(AddTableFragment.newInstance(item));
} else { } else {
CommonTipDialog.showSurpisedDialog(mActivity, item.getTableName() + "檯正在使用中", null, null, null, null, null); CommonTipDialog.showSurpisedDialog(mActivity, item.getTableName() + "檯正在使用中", null, null, null, null, null);
...@@ -323,11 +321,36 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -323,11 +321,36 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
itemTouchHelperCallback.setOnMoveListener(new RecyItemTouchHelperCallback.onMoveListener() { itemTouchHelperCallback.setOnMoveListener(new RecyItemTouchHelperCallback.onMoveListener() {
@Override @Override
public void onMoveFinish(String ids) { public void onMoveFinish(RecyclerView.Adapter adapter) {
mActivity.changeTableSort(ids); if (mAdapter instanceof QMUIStickySectionAdapter) {
QMUIStickySectionAdapter qmuiStickySectionAdapter = (QMUIStickySectionAdapter) mAdapter;
List<QMUISection<SectionHeader, TableItem>> qmuiSectionList = qmuiStickySectionAdapter.getCurrentData();
String ids = getTableIds(qmuiSectionList);
if (!TextUtils.isEmpty(ids)) {
mActivity.changeTableSort(getTableIds(qmuiSectionList));
}
}
} }
});
private String getTableIds(List<QMUISection<SectionHeader, TableItem>> qmuiSectionList) {
StringBuilder builder = new StringBuilder();
for (QMUISection<SectionHeader, TableItem> qmuiSections : qmuiSectionList) {
for (QMUISection.Model t : qmuiSections.getItemList()) {
TableItem tableItem = (TableItem) t;
if (tableItem.getLayoutType() == 0) {
builder.append(tableItem.getId());
builder.append(",");
}
}
}
String str = builder.toString();
if (str.endsWith(",")) {
str = str.substring(0, str.length() - 1);
}
return str;
}
});
mSectionLayout.setAdapter(mAdapter, true); mSectionLayout.setAdapter(mAdapter, true);
} }
......
order-base/build.gradle 0 → 100644
ext.alwaysLib = true //虽然apply了cc-settings-2.gradle，但一直作为library编译，否则别的组件依赖此module时会报错
apply from: rootProject.file("cc-settings.gradle")
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion rootProject.ext.android["compileSdkVersion"]
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
// 避免 lint 检测出错时停止构建
lintOptions {
abortOnError false
}
defaultConfig {
minSdkVersion rootProject.ext.android["minSdkVersion"]
targetSdkVersion rootProject.ext.android["targetSdkVersion"]
versionCode rootProject.ext.android["versionCode"]
versionName rootProject.ext.android["versionName"]
multiDexEnabled true
}
resourcePrefix "order_base"
buildTypes {
debug {
buildConfigField "boolean", "LOG_DEBUG", "true"
buildConfigField "boolean", "USE_CANARY", "true"
minifyEnabled false
proguardFiles 'proguard.cfg'
}
release {
buildConfigField "boolean", "LOG_DEBUG", "false"
buildConfigField "boolean", "USE_CANARY", "false"
minifyEnabled false
shrinkResources false
zipAlignEnabled false
proguardFiles 'proguard.cfg'
}
}
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
debugImplementation rootProject.ext.dependencies["canary-debug"]
releaseImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["junit"]
implementation 'org.projectlombok:lombok:1.18.8'
annotationProcessor 'org.projectlombok:lombok:1.18.8'
}
order-base/proguard-rules.pro 0 → 100644
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
order-base/src/androidTest/java/com/gingersoft/gsa/cloud/order/base/ExampleInstrumentedTest.java 0 → 100644
package com.gingersoft.gsa.cloud.order.base;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.gingersoft.gsa.cloud.order.base.test", appContext.getPackageName());
}
}
order-base/src/main/AndroidManifest.xml 0 → 100644
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gingersoft.gsa.cloud.order.base" />
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/ComponentBaseOrder.java 0 → 100644
package com.gingersoft.gsa.cloud.base.order;
import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.IComponent;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
public class ComponentBaseOrder implements IComponent {
@Override
public String getName() {
//组件的名称，调用此组件的方式：
return "Component.Base.Order";
}
/**
* 组件被调用时的入口
* 要确保每个逻辑分支都会调用到CC.sendCCResult，
* 包括try-catch,if-else,switch-case-default,startActivity
*
* @param cc 组件调用对象，可从此对象中获取相关信息
* @return true:将异步调用CC.sendCCResult(...),用于异步实现相关功能，例如：文件加载、网络请求等
* false:会同步调用CC.sendCCResult(...),即在onCall方法return之前调用，否则将被视为不合法的实现
*/
@Override
public boolean onCall(CC cc) {
String actionName = cc.getActionName();
switch (actionName) {
case "clearDoshokuOrder":
clearDoshokuOrder(cc);
break;
default:
//这个逻辑分支上没有调用CC.sendCCResult(...),是一种错误的示例
//并且方法的返回值为false，代表不会异步调用CC.sendCCResult(...)
//在LocalCCInterceptor中将会返回错误码为-10的CCResult
break;
}
return false;
}
private void clearDoshokuOrder(CC cc) {
//清空賬單數據
MyOrderManage.getInstance().clear();
//清空開檯數據
OpenTableManage.getDefault().clear();
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/base/adapter/print/FoodAdapter.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/adapter/print/FoodAdapter.java
package com.gingersoft.gsa.cloud.base.adapter.print; package com.gingersoft.gsa.cloud.base.order.adapter.print;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
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.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import java.util.List; import java.util.List;
import androidx.annotation.Nullable;
/** /**
* Created by Wyh on 2020/1/9. * Created by Wyh on 2020/1/9.
*/ */
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/adapter/print/KitChenPrintFoodAdapter.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/adapter/print/KitChenPrintFoodAdapter.java
package com.gingersoft.gsa.cloud.base.adapter.print; package com.gingersoft.gsa.cloud.base.order.adapter.print;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
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.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import androidx.annotation.Nullable;
/** /**
* Created by Wyh on 2020/2/20. * Created by Wyh on 2020/2/20.
*/ */
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/BillOrderMoney.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/BillOrderMoney.java
package com.gingersoft.gsa.cloud.base.common.bean; package com.gingersoft.gsa.cloud.base.order.bean;
import android.graphics.Color; import android.graphics.Color;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/DeleteOrderRequest.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/DeleteOrderRequest.java
package com.gingersoft.gsa.cloud.base.common.bean; package com.gingersoft.gsa.cloud.base.order.bean;
import java.util.List; import java.util.List;
import java.util.Map;
import lombok.Data; import lombok.Data;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderBean.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderBean.java
package com.gingersoft.gsa.cloud.base.common.bean; package com.gingersoft.gsa.cloud.base.order.bean;
import com.gingersoft.gsa.cloud.base.common.bean.discount.OrderDiscount;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.order.bean.discount.OrderDiscount;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderDetail.java
package com.gingersoft.gsa.cloud.base.common.bean; package com.gingersoft.gsa.cloud.base.order.bean;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.database.bean.ComboItem; import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Discount; import com.gingersoft.gsa.cloud.database.bean.Discount;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderPayRequest.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderPayRequest.java
package com.gingersoft.gsa.cloud.base.common.bean; package com.gingersoft.gsa.cloud.base.order.bean;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/discount/CouponDiscountBean.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/CouponDiscountBean.java
package com.gingersoft.gsa.cloud.base.common.bean.discount; package com.gingersoft.gsa.cloud.base.order.bean.discount;
import android.text.TextUtils; import android.text.TextUtils;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/discount/CouponDiscountResult.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/CouponDiscountResult.java
package com.gingersoft.gsa.cloud.base.common.bean.discount; package com.gingersoft.gsa.cloud.base.order.bean.discount;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo; import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/discount/OrderDiscount.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java
package com.gingersoft.gsa.cloud.base.common.bean.discount; package com.gingersoft.gsa.cloud.base.order.bean.discount;
import com.gingersoft.gsa.cloud.base.common.bean.BillOrderMoney; import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
import java.io.Serializable; import java.io.Serializable;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/mealManger/MyOrderManage.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/mealManger/MyOrderManage.java
package com.gingersoft.gsa.cloud.base.common.bean.mealManger; package com.gingersoft.gsa.cloud.base.order.bean.mealManger;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.common.bean.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo; import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.common.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod; import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.order.bean.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.print.bean.OrderDetails; import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
...@@ -38,13 +38,7 @@ public class MyOrderManage { ...@@ -38,13 +38,7 @@ public class MyOrderManage {
return myOrderManage; return myOrderManage;
} }
// private ShopCart shopCart;
private boolean overMaxQty = false;
private int Languageindex;
private boolean Edit_Send = false;
private int selpostion = 0; private int selpostion = 0;
private int selstartpostion = 0; private int selstartpostion = 0;
private int selendpostion = 0; private int selendpostion = 0;
private int selmainstartpositon = 0; private int selmainstartpositon = 0;
...@@ -52,11 +46,6 @@ public class MyOrderManage { ...@@ -52,11 +46,6 @@ public class MyOrderManage {
private int select_Full_start_position = 0; private int select_Full_start_position = 0;
private int select_Full_end_position = 0; private int select_Full_end_position = 0;
private int seqno = 1; //一级序
private int sseq = 0;//二级序
private int mseq = 0;//三级序
private OrderBean orderBean; private OrderBean orderBean;
/** /**
...@@ -344,30 +333,6 @@ public class MyOrderManage { ...@@ -344,30 +333,6 @@ public class MyOrderManage {
modifyOrder = false; modifyOrder = false;
} }
public boolean isOverMaxQty() {
return overMaxQty;
}
public void setOverMaxQty(boolean overMaxQty) {
this.overMaxQty = overMaxQty;
}
public int getLanguageindex() {
return Languageindex;
}
public void setLanguageindex(int languageindex) {
Languageindex = languageindex;
}
public boolean isEdit_Send() {
return Edit_Send;
}
public void setEdit_Send(boolean edit_Send) {
Edit_Send = edit_Send;
}
public int getSelpostion() { public int getSelpostion() {
return selpostion; return selpostion;
} }
...@@ -432,30 +397,6 @@ public class MyOrderManage { ...@@ -432,30 +397,6 @@ public class MyOrderManage {
MyOrderManage.dataBean = dataBean; MyOrderManage.dataBean = dataBean;
} }
public int getSeqno() {
return seqno;
}
public void setSeqno(int seqno) {
this.seqno = seqno;
}
public int getSseq() {
return sseq;
}
public void setSseq(int sseq) {
this.sseq = sseq;
}
public int getMseq() {
return mseq;
}
public void setMseq(int mseq) {
this.mseq = mseq;
}
public float getAddPoints() { public float getAddPoints() {
return addPoints; return addPoints;
} }
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/mealManger/OpenTableManage.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/mealManger/OpenTableManage.java
package com.gingersoft.gsa.cloud.base.common.bean.mealManger; package com.gingersoft.gsa.cloud.base.order.bean.mealManger;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean; import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import lombok.Data; import lombok.Data;
......
order-base/src/main/res/values/strings.xml 0 → 100644
<resources>
<string name="app_name">order-base</string>
</resources>
order-base/src/test/java/com/gingersoft/gsa/cloud/order/base/ExampleUnitTest.java 0 → 100644
package com.gingersoft.gsa.cloud.order.base;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}
\ No newline at end of file
print-module/src/main/java/com/joe/print/mvp/presenter/PrintAddCurrencyPresenter.java
...@@ -2,17 +2,14 @@ package com.joe.print.mvp.presenter; ...@@ -2,17 +2,14 @@ package com.joe.print.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.bean.PublicBean; import com.gingersoft.gsa.cloud.bean.PublicBean;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean; import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import io.reactivex.Scheduler;
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;
...@@ -26,8 +23,6 @@ import javax.inject.Inject; ...@@ -26,8 +23,6 @@ import javax.inject.Inject;
import com.jess.arms.utils.RxLifecycleUtils; import com.jess.arms.utils.RxLifecycleUtils;
import com.joe.print.mvp.contract.PrintAddCurrencyContract; import com.joe.print.mvp.contract.PrintAddCurrencyContract;
import java.util.List;
@ActivityScope @ActivityScope
public class PrintAddCurrencyPresenter extends BasePresenter<PrintAddCurrencyContract.Model, PrintAddCurrencyContract.View> { public class PrintAddCurrencyPresenter extends BasePresenter<PrintAddCurrencyContract.Model, PrintAddCurrencyContract.View> {
......
print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
...@@ -3,14 +3,13 @@ package com.joe.print.mvp.print; ...@@ -3,14 +3,13 @@ package com.joe.print.mvp.print;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.gingersoft.gsa.cloud.base.common.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.common.bean.BillingBean; import com.gingersoft.gsa.cloud.base.common.bean.BillingBean;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo; import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.OpenTableManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.constans.ExpandConstant; import com.gingersoft.gsa.cloud.constans.ExpandConstant;
......
print-module/src/main/java/com/joe/print/mvp/print/PrintKitchen.java
...@@ -6,14 +6,11 @@ import android.view.View; ...@@ -6,14 +6,11 @@ import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.adapter.print.KitChenPrintFoodAdapter;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.adapter.print.KitChenPrintFoodAdapter;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.OpenTableManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil; import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
...@@ -25,6 +22,9 @@ import java.util.List; ...@@ -25,6 +22,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/** /**
* 廚房單打印 * 廚房單打印
*/ */
......
print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java
...@@ -7,12 +7,9 @@ import android.view.View; ...@@ -7,12 +7,9 @@ import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil; import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
...@@ -31,6 +28,9 @@ import java.util.List; ...@@ -31,6 +28,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/** /**
* 外送接單，印單 已改新版 * 外送接單，印單 已改新版
*/ */
......
print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
...@@ -6,13 +6,9 @@ import android.view.LayoutInflater; ...@@ -6,13 +6,9 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
...@@ -29,6 +25,9 @@ import java.util.HashMap; ...@@ -29,6 +25,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/** /**
* 打印外賣接單 結賬單 * 打印外賣接單 結賬單
*/ */
......
print-module/src/main/java/com/joe/print/mvp/print/PrintServe.java
...@@ -6,17 +6,13 @@ import android.view.Gravity; ...@@ -6,17 +6,13 @@ import android.view.Gravity;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.adapter.print.FoodAdapter;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BillingBean; import com.gingersoft.gsa.cloud.base.common.bean.BillingBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.adapter.print.FoodAdapter;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.OpenTableManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.joe.print.R; import com.joe.print.R;
...@@ -26,6 +22,9 @@ import java.util.HashMap; ...@@ -26,6 +22,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/** /**
* 上菜紙打印 已改新版 * 上菜紙打印 已改新版
*/ */
......
print-module/src/main/java/com/joe/print/mvp/print/PrintSlip.java
...@@ -4,19 +4,17 @@ import android.content.Context; ...@@ -4,19 +4,17 @@ import android.content.Context;
import android.graphics.Bitmap; 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.base.common.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.common.bean.BillingBean; import com.gingersoft.gsa.cloud.base.common.bean.BillingBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.OpenTableManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.constans.ExpandConstant; import com.gingersoft.gsa.cloud.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.joe.print.R; import com.joe.print.R;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
......
print-module/src/main/java/com/joe/print/mvp/print/PrintTest.java
...@@ -7,7 +7,7 @@ import android.view.View; ...@@ -7,7 +7,7 @@ import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.print.bean.OrderDetails; import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
......
print-module/src/main/java/com/joe/print/mvp/print/PrintUtils.java
...@@ -8,16 +8,16 @@ import android.widget.TextView; ...@@ -8,16 +8,16 @@ import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.adapter.print.BillAdapter; import com.gingersoft.gsa.cloud.base.adapter.print.BillAdapter;
import com.gingersoft.gsa.cloud.base.adapter.print.BillTypeAdapter; import com.gingersoft.gsa.cloud.base.adapter.print.BillTypeAdapter;
import com.gingersoft.gsa.cloud.base.adapter.print.FoodAdapter;
import com.gingersoft.gsa.cloud.base.adapter.print.KitChenPrintFoodAdapter;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.common.bean.BillingBean; import com.gingersoft.gsa.cloud.base.common.bean.BillingBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod; import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.adapter.print.FoodAdapter;
import com.gingersoft.gsa.cloud.base.common.bean.mealManger.OpenTableManage; import com.gingersoft.gsa.cloud.base.order.adapter.print.KitChenPrintFoodAdapter;
import com.gingersoft.gsa.cloud.base.common.bean.table.TableBean; import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.PrintTransitUtils; import com.gingersoft.gsa.cloud.base.utils.PrintTransitUtils;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
...@@ -26,14 +26,12 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; ...@@ -26,14 +26,12 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.base.utils.view.ImageUtils; import com.gingersoft.gsa.cloud.base.utils.view.ImageUtils;
import com.gingersoft.gsa.cloud.base.utils.view.LayoutToBitmapUtils; import com.gingersoft.gsa.cloud.base.utils.view.LayoutToBitmapUtils;
import com.joe.print.R; import com.joe.print.R;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
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.Objects; import java.util.Objects;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
......
print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
...@@ -18,21 +18,16 @@ import android.widget.ImageView; ...@@ -18,21 +18,16 @@ import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.ColorRes;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.epson.epos2.printer.Printer; 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.base.adapter.print.BillAdapter; import com.gingersoft.gsa.cloud.base.adapter.print.BillAdapter;
import com.gingersoft.gsa.cloud.base.adapter.print.BillTypeAdapter; import com.gingersoft.gsa.cloud.base.adapter.print.BillTypeAdapter;
import com.gingersoft.gsa.cloud.base.adapter.print.FoodAdapter;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BillingBean; import com.gingersoft.gsa.cloud.base.common.bean.BillingBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod; import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.base.order.adapter.print.FoodAdapter;
import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.threadPool.ThreadPoolManager; import com.gingersoft.gsa.cloud.base.threadPool.ThreadPoolManager;
import com.gingersoft.gsa.cloud.base.utils.AidlUtil; import com.gingersoft.gsa.cloud.base.utils.AidlUtil;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
...@@ -77,6 +72,10 @@ import java.util.List; ...@@ -77,6 +72,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import androidx.annotation.ColorRes;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import io.reactivex.Observer; import io.reactivex.Observer;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
...@@ -15,7 +15,6 @@ import android.view.Window; ...@@ -15,7 +15,6 @@ import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.LinearLayout; 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 androidx.core.content.ContextCompat;
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintAddCurrencyActivity.java
...@@ -6,9 +6,6 @@ import android.view.View; ...@@ -6,9 +6,6 @@ import android.view.View;
import android.widget.Switch; import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.base.widget.DialogUtils; import com.gingersoft.gsa.cloud.base.widget.DialogUtils;
...@@ -28,6 +25,8 @@ import java.util.ArrayList; ...@@ -28,6 +25,8 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrinterListActivity.java
...@@ -2,12 +2,10 @@ package com.joe.print.mvp.ui.activity; ...@@ -2,12 +2,10 @@ package com.joe.print.mvp.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager;
import com.gingersoft.gsa.cloud.ui.adapter.TabFragmentAdapter; import com.gingersoft.gsa.cloud.ui.adapter.TabFragmentAdapter;
import com.gingersoft.gsa.cloud.ui.view.MyTableView; import com.gingersoft.gsa.cloud.ui.view.MyTableView;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
......
print-module/src/main/java/com/joe/print/mvp/ui/fragment/LocalPrintFragment.java
...@@ -7,15 +7,9 @@ import android.view.LayoutInflater; ...@@ -7,15 +7,9 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean; import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils; import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils;
import com.gingersoft.gsa.cloud.ui.utils.AppDialog; import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
...@@ -28,11 +22,12 @@ import com.joe.print.di.component.DaggerLocalPrintComponent; ...@@ -28,11 +22,12 @@ import com.joe.print.di.component.DaggerLocalPrintComponent;
import com.joe.print.di.module.LocalPrintModule; import com.joe.print.di.module.LocalPrintModule;
import com.joe.print.mvp.contract.LocalPrintContract; import com.joe.print.mvp.contract.LocalPrintContract;
import com.joe.print.mvp.presenter.LocalPrintPresenter; import com.joe.print.mvp.presenter.LocalPrintPresenter;
import com.joe.print.mvp.print.PrintUtils;
import com.joe.print.mvp.ui.activity.PrintAddCurrencyActivity; import com.joe.print.mvp.ui.activity.PrintAddCurrencyActivity;
import java.util.List; import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import butterknife.BindView; import butterknife.BindView;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
......
settings.gradle
...@@ -12,6 +12,8 @@ include 'cc-register', ...@@ -12,6 +12,8 @@ include 'cc-register',
'updateApk', 'updateApk',
'base-module', 'base-module',
'table-base',
'order-base',
'login-module', 'login-module',
'main-module', 'main-module',
'download-module', 'download-module',
......
table-base/build.gradle 0 → 100644
ext.alwaysLib = true //虽然apply了cc-settings-2.gradle，但一直作为library编译，否则别的组件依赖此module时会报错
apply from: rootProject.file("cc-settings.gradle")
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
android {
compileSdkVersion rootProject.ext.android["compileSdkVersion"]
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
// 避免 lint 检测出错时停止构建
lintOptions {
abortOnError false
}
defaultConfig {
minSdkVersion rootProject.ext.android["minSdkVersion"]
targetSdkVersion rootProject.ext.android["targetSdkVersion"]
versionCode rootProject.ext.android["versionCode"]
versionName rootProject.ext.android["versionName"]
multiDexEnabled true
}
resourcePrefix "table_base"
buildTypes {
debug {
buildConfigField "boolean", "LOG_DEBUG", "true"
buildConfigField "boolean", "USE_CANARY", "true"
minifyEnabled false
proguardFiles 'proguard.cfg'
}
release {
buildConfigField "boolean", "LOG_DEBUG", "false"
buildConfigField "boolean", "USE_CANARY", "false"
minifyEnabled false
shrinkResources false
zipAlignEnabled false
proguardFiles 'proguard.cfg'
}
}
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
debugImplementation rootProject.ext.dependencies["canary-debug"]
releaseImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["junit"]
implementation 'org.projectlombok:lombok:1.18.8'
annotationProcessor 'org.projectlombok:lombok:1.18.8'
}
table-base/proguard-rules.pro 0 → 100644
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
table-base/src/androidTest/java/com/gingersoft/gsa/cloud/ExampleInstrumentedTest.java 0 → 100644
package com.gingersoft.gsa.cloud;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.gingersoft.gsa.table_base.test", appContext.getPackageName());
}
}
table-base/src/main/AndroidManifest.xml 0 → 100644
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gingersoft.gsa.cloud" />
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/table/TableArea.java → table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableArea.java
package com.gingersoft.gsa.cloud.base.common.bean.table; package com.gingersoft.gsa.cloud.base.table.bean;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import java.io.Serializable; import java.io.Serializable;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/table/TableBean.java → table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableBean.java
package com.gingersoft.gsa.cloud.base.common.bean.table; package com.gingersoft.gsa.cloud.base.table.bean;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/table/TableExtBean.java → table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableExtBean.java
package com.gingersoft.gsa.cloud.base.common.bean.table; package com.gingersoft.gsa.cloud.base.table.bean;
import java.util.List; import java.util.List;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/table/TableItem.java → table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableItem.java
package com.gingersoft.gsa.cloud.base.common.bean.table; package com.gingersoft.gsa.cloud.base.table.bean;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import java.io.Serializable; import java.io.Serializable;
/** /**
......
table-base/src/main/res/values/strings.xml 0 → 100644
<resources>
<string name="app_name">table-base</string>
</resources>
table-base/src/test/java/com/gingersoft/gsa/cloud/ExampleUnitTest.java 0 → 100644
package com.gingersoft.gsa.cloud;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}
\ No newline at end of file
table-module/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gingersoft.gsa.cloud.table"> package="com.gingersoft.gsa.cloud.bean">
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" /> <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
......
table-module/src/main/debug/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gingersoft.gsa.cloud.table"> package="com.gingersoft.gsa.cloud.bean">
<application <application
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication"
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
android:supportsRtl="true" android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".mvp.ui.activity.orderManager.OrderDetailActivity"/> <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderDetailActivity"/>
<activity android:name=".mvp.ui.activity.orderManager.OrderCenterActivity" /> <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderCenterActivity" />
<activity android:name=".mvp.ui.activity.SoldoutCtrlActivity" /> <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.SoldoutCtrlActivity" />
<activity android:name=".mvp.ui.activity.TableActivity"> <activity android:name="com.gingersoft.gsa.cloud.bean.mvp.ui.activity.TableActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/ComponentTable.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/ComponentTable.java
package com.gingersoft.gsa.cloud.table; package com.gingersoft.gsa.cloud.bean;
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.function.FModule; import com.gingersoft.gsa.cloud.function.FModule;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.SoldoutCtrlActivity; import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.SoldoutCtrlActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity; import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity; import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.OrderPayActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity; import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.TableActivity;
public class ComponentTable implements IComponent { public class ComponentTable implements IComponent {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/PayConstant.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/PayConstant.java
package com.gingersoft.gsa.cloud.table.app.payment; package com.gingersoft.gsa.cloud.bean.app.payment;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/AdjustTipRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/AdjustTipRequest.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/AdjustTipRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/AdjustTipRespose.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/PayRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/PayRequest.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RefundRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RefundRequest.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RefundRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RefundRespose.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RetrievalRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RetrievalRequest.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/RetrievalRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/RetrievalRespose.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/SaleRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/SaleRespose.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/SettlementRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/SettlementRequest.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/SettlementRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/SettlementRespose.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/VoidRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/VoidRequest.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/VoidRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/VoidRespose.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/bean/WaitRequest.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/bean/WaitRequest.java
package com.gingersoft.gsa.cloud.table.app.payment.bean; package com.gingersoft.gsa.cloud.bean.app.payment.bean;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/callback/CommandImpl.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/callback/CommandImpl.java
package com.gingersoft.gsa.cloud.table.app.payment.callback; package com.gingersoft.gsa.cloud.bean.app.payment.callback;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
...@@ -7,7 +7,7 @@ import com.elvishew.xlog.XLog; ...@@ -7,7 +7,7 @@ import com.elvishew.xlog.XLog;
import com.etps.aca.lib.action.ICommand; import com.etps.aca.lib.action.ICommand;
import com.etps.aca.lib.constant.Constant; import com.etps.aca.lib.constant.Constant;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity; import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.OrderPayActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/contract/IN5Action.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/contract/IN5Action.java
package com.gingersoft.gsa.cloud.table.app.payment.contract; package com.gingersoft.gsa.cloud.bean.app.payment.contract;
import android.content.Context; import android.content.Context;
import com.gingersoft.gsa.cloud.table.app.payment.bean.AdjustTipRequest; import com.gingersoft.gsa.cloud.bean.app.payment.bean.AdjustTipRequest;
import com.gingersoft.gsa.cloud.table.app.payment.bean.PayRequest; import com.gingersoft.gsa.cloud.bean.app.payment.bean.PayRequest;
import com.gingersoft.gsa.cloud.table.app.payment.bean.RefundRequest; import com.gingersoft.gsa.cloud.bean.app.payment.bean.RefundRequest;
import com.gingersoft.gsa.cloud.table.app.payment.bean.RetrievalRequest; import com.gingersoft.gsa.cloud.bean.app.payment.bean.RetrievalRequest;
import com.gingersoft.gsa.cloud.table.app.payment.bean.SettlementRequest; import com.gingersoft.gsa.cloud.bean.app.payment.bean.SettlementRequest;
import com.gingersoft.gsa.cloud.table.app.payment.bean.VoidRequest; import com.gingersoft.gsa.cloud.bean.app.payment.bean.VoidRequest;
import com.gingersoft.gsa.cloud.table.app.printer.PrintPaymentStub; import com.gingersoft.gsa.cloud.bean.app.printer.PrintPaymentStub;
/** /**
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/contract/IN5Callback.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/payment/contract/IN5Callback.java
package com.gingersoft.gsa.cloud.table.app.payment.contract; package com.gingersoft.gsa.cloud.bean.app.payment.contract;
import com.gingersoft.gsa.cloud.table.app.payment.bean.AdjustTipRespose; import com.gingersoft.gsa.cloud.bean.app.payment.bean.AdjustTipRespose;
import com.gingersoft.gsa.cloud.table.app.payment.bean.RefundRespose; import com.gingersoft.gsa.cloud.bean.app.payment.bean.RefundRespose;
import com.gingersoft.gsa.cloud.table.app.payment.bean.RetrievalRespose; import com.gingersoft.gsa.cloud.bean.app.payment.bean.RetrievalRespose;
import com.gingersoft.gsa.cloud.table.app.payment.bean.SaleRespose; import com.gingersoft.gsa.cloud.bean.app.payment.bean.SaleRespose;
import com.gingersoft.gsa.cloud.table.app.payment.bean.SettlementRespose; import com.gingersoft.gsa.cloud.bean.app.payment.bean.SettlementRespose;
import com.gingersoft.gsa.cloud.table.app.payment.bean.VoidRespose; import com.gingersoft.gsa.cloud.bean.app.payment.bean.VoidRespose;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/app/printer/PrintPaymentStub.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/app/printer/PrintPaymentStub.java
package com.gingersoft.gsa.cloud.table.app.printer; package com.gingersoft.gsa.cloud.bean.app.printer;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/AllOrderComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/AllOrderComponent.java
package com.gingersoft.gsa.cloud.table.di.component; package com.gingersoft.gsa.cloud.bean.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.AllOrderModule; import com.gingersoft.gsa.cloud.bean.di.module.AllOrderModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract; import com.gingersoft.gsa.cloud.bean.mvp.contract.AllOrderContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment; import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.AllOrderFragment;
/** /**
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/AllTableComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/AllTableComponent.java
package com.gingersoft.gsa.cloud.table.di.component; package com.gingersoft.gsa.cloud.bean.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.AllTableModule; import com.gingersoft.gsa.cloud.bean.di.module.AllTableModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.AllTableContract; import com.gingersoft.gsa.cloud.bean.mvp.contract.AllTableContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment; import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.AllTableFragment;
/** /**
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/FineItemAllComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/FineItemAllComponent.java
package com.gingersoft.gsa.cloud.table.di.component; package com.gingersoft.gsa.cloud.bean.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.FineItemAllModule; import com.gingersoft.gsa.cloud.bean.di.module.FineItemAllModule;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemAllContract; import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemAllContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.FineItemAllFragment; import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.FineItemAllFragment;
/** /**
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/di/component/FineItemOneselfComponent.java → table-module/src/main/java/com/gingersoft/gsa/cloud/bean/di/component/FineItemOneselfComponent.java
package com.gingersoft.gsa.cloud.table.di.component; package com.gingersoft.gsa.cloud.bean.di.component;
import dagger.BindsInstance; import dagger.BindsInstance;
import dagger.Component; import dagger.Component;
import com.gingersoft.gsa.cloud.table.mvp.contract.FineItemOneselfContract; import com.gingersoft.gsa.cloud.bean.mvp.contract.FineItemOneselfContract;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.FineItemOneselfFragment; import com.gingersoft.gsa.cloud.bean.mvp.ui.fragment.FineItemOneselfFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.table.di.module.FineItemOneselfModule; import com.gingersoft.gsa.cloud.bean.di.module.FineItemOneselfModule;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
......
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