Skip to content

S
supplier
Commit ef185a8d by 王宇航
Options

首頁、廚房單打印

parent 83ec6e5f
Showing with 300 additions and 73 deletions
chart/src/main/java/com/daivd/chart/component/axis/VerticalAxis.java
...@@ -16,6 +16,7 @@ import java.util.List; ...@@ -16,6 +16,7 @@ import java.util.List;
/** /**
* 图表竖轴 * 图表竖轴
*
* @author huangyanbin * @author huangyanbin
*/ */
...@@ -30,6 +31,7 @@ public class VerticalAxis extends BaseAxis<Double> { ...@@ -30,6 +31,7 @@ public class VerticalAxis extends BaseAxis<Double> {
/** /**
* 横轴构造方法 * 横轴构造方法
* <p>可以设置横轴方向 左右方位</p> * <p>可以设置横轴方向 左右方位</p>
*
* @param direction 方位 * @param direction 方位
*/ */
public VerticalAxis(int direction) { public VerticalAxis(int direction) {
...@@ -44,20 +46,21 @@ public class VerticalAxis extends BaseAxis<Double> { ...@@ -44,20 +46,21 @@ public class VerticalAxis extends BaseAxis<Double> {
/** /**
* 计算刻度大小 * 计算刻度大小
* <p>通过计算刻度的宽高得到轴的大小，然后保存到scaleData对象中，以便后面的计算</p> * <p>通过计算刻度的宽高得到轴的大小，然后保存到scaleData对象中，以便后面的计算</p>
*
* @param chartData 图表数据 * @param chartData 图表数据
* @param rect 图表原始范围 * @param rect 图表原始范围
* @param paint 画笔 * @param paint 画笔
*/ */
@Override @Override
public void computeScale(ChartData<? extends BarData> chartData, Rect rect, Paint paint) { public void computeScale(ChartData<? extends BarData> chartData, Rect rect, Paint paint) {
if(isDisplay()) { if (isDisplay()) {
ScaleData scaleData = chartData.getScaleData(); ScaleData scaleData = chartData.getScaleData();
scaleData.resetScale(scaleSetData, direction); scaleData.resetScale(scaleSetData, direction);
scaleStyle.fillPaint(paint); scaleStyle.fillPaint(paint);
int length = Math.max(formatVerticalAxisData(scaleData.getMaxScaleValue(direction)).length(), int length = Math.max(formatVerticalAxisData(scaleData.getMaxScaleValue(direction)).length(),
formatVerticalAxisData(scaleData.getMinScaleValue(direction)).length()); formatVerticalAxisData(scaleData.getMinScaleValue(direction)).length());
int textHeight = (int) (paint.measureText("1", 0, 1) * length); int textHeight = (int) (paint.measureText("1", 0, 1) * length);
int dis = (int) (textHeight + scaleStyle.getPadding() + axisStyle.getWidth()); int dis = (int) (textHeight + scaleStyle.getPadding() + axisStyle.getWidth() + scaleStyle.getScalePadding());
if (direction == AxisDirection.LEFT) { if (direction == AxisDirection.LEFT) {
scaleData.scaleRect.left = dis; scaleData.scaleRect.left = dis;
} else { } else {
...@@ -65,33 +68,36 @@ public class VerticalAxis extends BaseAxis<Double> { ...@@ -65,33 +68,36 @@ public class VerticalAxis extends BaseAxis<Double> {
} }
} }
} }
/** /**
* 绘制刻度 * 绘制刻度
* <p>通过zoomRect计算出每个刻度的宽度，迭代绘制刻度</p> * <p>通过zoomRect计算出每个刻度的宽度，迭代绘制刻度</p>scaleData对象，軸的數據
* @param canvas 画布 *
* @param zoomRect 缩放之后范围 * @param canvas 画布
* @param zoomRect 缩放之后范围
* @param clipRect 原始范围 * @param clipRect 原始范围
* @param paint 画笔 * @param paint 画笔
* @param chartData 图表数据 * @param chartData 图表数据
*/ */
@Override @Override
protected void drawScale(Canvas canvas, Rect zoomRect, Rect clipRect, Paint paint, ChartData<? extends BarData> chartData) { protected void drawScale(Canvas canvas, Rect zoomRect, Rect clipRect, Paint paint, ChartData<? extends BarData> chartData) {
ScaleData scaleData = chartData.getScaleData(); ScaleData scaleData = chartData.getScaleData();
List<Double> scaleList = scaleData.getScaleList(direction); List<Double> scaleList = scaleData.getScaleList(direction);
float startX; float startX;
if (direction == AxisDirection.LEFT) { if (direction == AxisDirection.LEFT) {
startX = zoomRect.left + scaleData.scaleRect.right + scaleStyle.getPadding(); startX = zoomRect.left + scaleData.scaleRect.left + scaleStyle.getPadding() - scaleStyle.getScalePadding();
} else { } else {
startX = zoomRect.right - scaleData.scaleRect.right + scaleStyle.getPadding(); startX = zoomRect.right - scaleData.scaleRect.right + scaleStyle.getPadding() + scaleStyle.getScalePadding();
} }
int bottom = zoomRect.bottom; int bottom = zoomRect.bottom;
int height = zoomRect.height(); int height = zoomRect.height();
float textHeight = paint.measureText("1", 0, 1); float textHeight = paint.measureText("1", 0, 1);
int perHeight = height / (scaleList.size()-1); int perHeight = height / (scaleList.size() - 1);
for (int i = 0; i < scaleList.size(); i++) { for (int i = 0; i < scaleList.size(); i++) {
double value = scaleList.get(i); double value = scaleList.get(i);
float startY = bottom - i * perHeight; float startY = bottom - i * perHeight;
if (clipRect.contains(clipRect.centerX(), (int) startY-1)) {
if (clipRect.contains(clipRect.centerX(), (int) startY - 1)) {
drawText(canvas, startX, startY + textHeight / 2, value, paint); drawText(canvas, startX, startY + textHeight / 2, value, paint);
drawGrid(canvas, startY, zoomRect, scaleData.scaleRect, paint); drawGrid(canvas, startY, zoomRect, scaleData.scaleRect, paint);
} }
...@@ -105,7 +111,7 @@ public class VerticalAxis extends BaseAxis<Double> { ...@@ -105,7 +111,7 @@ public class VerticalAxis extends BaseAxis<Double> {
private void drawText(Canvas canvas, float startX, float startY, double value, Paint paint) { private void drawText(Canvas canvas, float startX, float startY, double value, Paint paint) {
scaleStyle.fillPaint(paint); scaleStyle.fillPaint(paint);
String content = formatVerticalAxisData(value); String content = formatVerticalAxisData(value);
paint.setTextAlign(Paint.Align.LEFT); paint.setTextAlign(Paint.Align.RIGHT);
canvas.drawText(content, startX, startY, paint); canvas.drawText(content, startX, startY, paint);
} }
...@@ -125,7 +131,8 @@ public class VerticalAxis extends BaseAxis<Double> { ...@@ -125,7 +131,8 @@ public class VerticalAxis extends BaseAxis<Double> {
/** /**
* 计算出裁切轴之后的范围 * 计算出裁切轴之后的范围
* @param rect 原始范围 *
* @param rect 原始范围
* @param scaleRect 缩放范围 * @param scaleRect 缩放范围
* @return 上下左右的大小 * @return 上下左右的大小
*/ */
...@@ -142,11 +149,12 @@ public class VerticalAxis extends BaseAxis<Double> { ...@@ -142,11 +149,12 @@ public class VerticalAxis extends BaseAxis<Double> {
endX = startX; endX = startX;
return new int[]{startX, startY, endX, endY}; return new int[]{startX, startY, endX, endY};
} }
/** /**
* 设置轴方位 * 设置轴方位
* <p>竖轴只能设置左右方位</p> * <p>竖轴只能设置左右方位</p>
* @param axisDirection 轴方位
* *
* @param axisDirection 轴方位
*/ */
@Override @Override
public void setAxisDirection(int axisDirection) { public void setAxisDirection(int axisDirection) {
...@@ -157,31 +165,36 @@ public class VerticalAxis extends BaseAxis<Double> { ...@@ -157,31 +165,36 @@ public class VerticalAxis extends BaseAxis<Double> {
/** /**
* 格式化竖轴数据 * 格式化竖轴数据
*
* @param value 数值 * @param value 数值
* @return 格式化竖轴之后数据 * @return 格式化竖轴之后数据
*/ */
private String formatVerticalAxisData(double value) { private String formatVerticalAxisData(double value) {
if(getFormat() != null){ if (getFormat() != null) {
return getFormat().format(value); return getFormat().format(value);
} }
return df.format(value); return df.format(value);
} }
/** /**
* 设置刻度是否从0开始 * 设置刻度是否从0开始
*/ */
public void setStartZero(boolean isStartZero){ public void setStartZero(boolean isStartZero) {
this.scaleSetData.setStartZoom(isStartZero); this.scaleSetData.setStartZoom(isStartZero);
} }
/** /**
* 设置刻度最大值 * 设置刻度最大值
*
* @param maxValue 最大值 * @param maxValue 最大值
*/ */
public void setMaxValue(double maxValue) { public void setMaxValue(double maxValue) {
this.scaleSetData.setMaxValue(maxValue); this.scaleSetData.setMaxValue(maxValue);
} }
/** /**
* 设置刻度最小值 * 设置刻度最小值
*
* @param minValue 最大值 * @param minValue 最大值
*/ */
public void setMinValue(double minValue) { public void setMinValue(double minValue) {
......
chart/src/main/java/com/daivd/chart/data/style/FontStyle.java
...@@ -17,6 +17,7 @@ public class FontStyle implements IStyle{ ...@@ -17,6 +17,7 @@ public class FontStyle implements IStyle{
private int textSize; private int textSize;
private int textColor; private int textColor;
private int padding = 0; private int padding = 0;
private int scalePadding = 0;//刻度與軸的間距
public static void setDefaultTextSize(int defaultTextSize){ public static void setDefaultTextSize(int defaultTextSize){
defaultFontSize = defaultTextSize; defaultFontSize = defaultTextSize;
...@@ -41,9 +42,14 @@ public class FontStyle implements IStyle{ ...@@ -41,9 +42,14 @@ public class FontStyle implements IStyle{
this.textSize = DensityUtils.sp2px(context,sp); this.textSize = DensityUtils.sp2px(context,sp);
this.textColor = textColor; this.textColor = textColor;
} }
public int getScalePadding() {
return scalePadding;
}
public void setScalePadding(int scalePadding) {
this.scalePadding = scalePadding;
}
public int getTextSize() { public int getTextSize() {
if(textSize == 0){ if(textSize == 0){
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/SectionItem.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.model.bean;
import com.qmuiteam.qmui.widget.section.QMUISection.Model;
import java.util.Objects;
public class SectionItem implements Model<SectionItem> {
private int image;
private String text;
public SectionItem(int image, String text) {
this.image = image;
this.text = text;
}
public String getText() {
return text;
}
public int getImage() {
return image;
}
@Override
public SectionItem cloneForDiff() {
return new SectionItem(getImage(), getText());
}
@Override
public boolean isSameItem(SectionItem other) {
return Objects.equals(text, other.text);
}
@Override
public boolean isSameContent(SectionItem other) {
return true;
}
}
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -7,12 +7,9 @@ import android.util.Log; ...@@ -7,12 +7,9 @@ import android.util.Log;
import android.view.View; import android.view.View;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.di.component.DaggerNewMainComponent; import com.gingersoft.gsa.cloud.main.di.component.DaggerNewMainComponent;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SectionHeader;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SectionItem; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SectionItem;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.HomeFunctionAdapter;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.MainOrderingAdapter; import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.MainOrderingAdapter;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
...@@ -32,6 +32,7 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; ...@@ -32,6 +32,7 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.HomeTurnoverBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.HomeTurnoverBean;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.MainActivity; import com.gingersoft.gsa.cloud.main.mvp.ui.activity.MainActivity;
import com.gingersoft.gsa.cloud.main.mvp.ui.view.CustomMarkView;
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;
...@@ -118,6 +119,7 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -118,6 +119,7 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
} }
private void loadReport() { private void loadReport() {
Resources res = getResources(); Resources res = getResources();
FontStyle.setDefaultTextSpSize(mContext, 12); FontStyle.setDefaultTextSpSize(mContext, 12);
...@@ -178,7 +180,6 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -178,7 +180,6 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
//不顯示網格 //不顯示網格
horizontalAxis.setDrawGrid(false); horizontalAxis.setDrawGrid(false);
horizontalAxis.getAxisStyle().setWidth(mContext,1).setColor(res.getColor(R.color.theme_color)); horizontalAxis.getAxisStyle().setWidth(mContext,1).setColor(res.getColor(R.color.theme_color));
//设置线条样式 //设置线条样式
verticalAxis.getAxisStyle().setWidth(mContext, 1).setColor(res.getColor(R.color.theme_color)); verticalAxis.getAxisStyle().setWidth(mContext, 1).setColor(res.getColor(R.color.theme_color));
//設置網格虛線樣式 //設置網格虛線樣式
...@@ -186,12 +187,16 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -186,12 +187,16 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
verticalAxis.setGridStyle(new LineStyle(0.5f, res.getColor(R.color.report_dotted_line_color))); verticalAxis.setGridStyle(new LineStyle(0.5f, res.getColor(R.color.report_dotted_line_color)));
verticalAxis.getGridStyle().setEffect(effects); verticalAxis.getGridStyle().setEffect(effects);
FontStyle scaleStyle = new FontStyle(mContext, 9, res.getColor(R.color.report_left_scale)); FontStyle scaleStyle = new FontStyle(mContext, 9, res.getColor(R.color.report_left_scale));
scaleStyle.setScalePadding(30);
horizontalAxis.setScaleStyle(scaleStyle); horizontalAxis.setScaleStyle(scaleStyle);
verticalAxis.setScaleStyle(scaleStyle); verticalAxis.setScaleStyle(scaleStyle);
lineChart.setZoom(false); lineChart.setZoom(false);
//开启十字架 //开启十字架
lineChart.getProvider().setOpenCross(true); lineChart.getProvider().setOpenCross(true);
//开启MarkView
// lineChart.getProvider().setOpenMark(true);
//设置MarkView
// lineChart.getProvider().setMarkView(new CustomMarkView(mContext));
//设置显示点 //设置显示点
Point point = new Point(); Point point = new Point();
point.getPointStyle().setShape(PointStyle.CIRCLE); point.getPointStyle().setShape(PointStyle.CIRCLE);
...@@ -206,29 +211,29 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -206,29 +211,29 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
lineChart.setFirstAnim(false); lineChart.setFirstAnim(false);
lineChart.setChartData(chartData2); lineChart.setChartData(chartData2);
lineChart.setOnClickColumnListener((lineData, pos) -> { lineChart.setOnClickColumnListener((lineData, pos) -> {
Paint paint = new Paint(); // Paint paint = new Paint();
paint.setAntiAlias(true); // paint.setAntiAlias(true);
paint.setTextSize(DensityUtils.sp2px(mContext, 13)); // paint.setTextSize(DensityUtils.sp2px(mContext, 13));
paint.setStyle(Paint.Style.FILL); // paint.setStyle(Paint.Style.FILL);
paint.setColor(Color.WHITE); // paint.setColor(Color.WHITE);
MultiLineBubbleTip tip = new MultiLineBubbleTip<LineData>(mContext, // MultiLineBubbleTip tip = new MultiLineBubbleTip<LineData>(mContext,
R.mipmap.round_rect, R.mipmap.triangle, paint) { // R.mipmap.round_rect, R.mipmap.triangle, paint) {
@Override // @Override
public boolean isShowTip(LineData lineData, int position) { // public boolean isShowTip(LineData lineData, int position) {
return position == pos; // return position == pos;
} // }
//
@Override // @Override
public String[] format(LineData lineData, int position) { // public String[] format(LineData lineData, int position) {
String title = lineData.getName(); // String title = lineData.getName();
String value = lineData.getChartYDataList().get(position) + lineData.getUnit(); // String value = lineData.getChartYDataList().get(position) + lineData.getUnit();
return new String[]{title, value}; // return new String[]{title, value};
} // }
}; // };
tip.setColorFilter(Color.parseColor("#FA8072")); // tip.setColorFilter(Color.parseColor("#FA8072"));
tip.setAlpha(0.8f); // tip.setAlpha(0.8f);
lineChart.getProvider().setTip(tip); // lineChart.getProvider().setTip(tip);
lineChart.invalidate(); // lineChart.invalidate();
}); });
} }
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/CustomMarkView.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.ui.view;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import com.daivd.chart.data.BarData;
import com.daivd.chart.provider.component.mark.IMark;
import com.daivd.chart.provider.component.tip.SingleLineBubbleTip;
import com.daivd.chart.utils.DensityUtils;
import com.gingersoft.gsa.cloud.base.widget.DialogUtils;
import com.gingersoft.gsa.cloud.main.R;
/**
* Created by huang on 2017/9/28.
*/
public class CustomMarkView<C extends BarData> implements IMark<C> {
private SingleLineBubbleTip<String> bubbleTip;
private Paint paint;
private View contentView;
private DialogUtils dialog;
public CustomMarkView(Context context) {
// contentView = LayoutInflater.from(context).inflate(R.layout.layout_markview, null);
dialog = new DialogUtils(context, R.layout.layout_markview) {
@Override
public void initLayout(ViewHepler hepler, Dialog dialog) {
}
}.createDialogView();
paint = new Paint();
paint.setAntiAlias(true);
paint.setTextSize(DensityUtils.sp2px(context, 13));
paint.setStyle(Paint.Style.FILL);
paint.setColor(Color.WHITE);
bubbleTip = new SingleLineBubbleTip<String>(context, R.drawable.bg, R.drawable.triangle1, paint) {
@Override
public boolean isShowTip(String s, int position) {
return true;
}
@Override
public String format(String s, int position) {
return s;
}
};
bubbleTip.setColorFilter(Color.parseColor("#F4A460"));
bubbleTip.setAlpha(0.8f);
}
public Paint getPaint() {
return paint;
}
@Override
public void drawMark(Canvas canvas, float x, float y, Rect rect, String content, BarData data, int position) {
// String text = content + "---" + data.getChartYDataList().get(position) + "---" + data.getUnit();
//
//
// bubbleTip.drawTip(canvas, x, y, rect, text, position);
dialog.show();
}
}
main/src/main/res/layout/layout_markview.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="12時"
android:textColor="#333333"
android:textSize="@dimen/sp_12" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<View
android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_8"
android:background="@color/theme_color" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="今日："
android:textColor="#333333"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1000"
android:textColor="#333333"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<View
android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_8"
android:background="#FFCC8F" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="昨日："
android:textColor="#333333"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1000"
android:textColor="#333333"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
main/src/main/res/values/colors.xml
...@@ -3,4 +3,9 @@ ...@@ -3,4 +3,9 @@
<color name="main_colorPrimary">#008577</color> <color name="main_colorPrimary">#008577</color>
<color name="main_colorPrimaryDark">#00574B</color> <color name="main_colorPrimaryDark">#00574B</color>
<color name="main_colorAccent">#D81B60</color> <color name="main_colorAccent">#D81B60</color>
<!-- 報表虛線顏色-->
<color name="report_dotted_line_color">#8CA0B3</color>
<color name="report_left_scale">#018EF2</color>
<!-- 報表“昨日”線條顏色-->
<color name="today_line">#FFCC8F</color>
</resources> </resources>
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
...@@ -117,8 +117,8 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print ...@@ -117,8 +117,8 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
bitmap = PrintUtils.getPrintBillBitmap(mContext); bitmap = PrintUtils.getPrintBillBitmap(mContext);
} else if (type == 3) { } else if (type == 3) {
//廚房單 //廚房單
List<Food> foods = CCUtil.getNavigateParam(this, "NewFoods", new ArrayList<>()); List<OrderDetail> foods = CCUtil.getNavigateParam(this, "NewFoods", new ArrayList<>());
bitmap = PrintUtils.getKitChenPrintBitmap(mContext,foods); bitmap = PrintUtils.getKitChenPrintBitmap(mContext, foods);
} else { } else {
ToastUtils.show(mContext, "打印失敗"); ToastUtils.show(mContext, "打印失敗");
finish(); finish();
......
public-base/build.gradle
...@@ -79,6 +79,5 @@ dependencies { ...@@ -79,6 +79,5 @@ dependencies {
implementation 'org.greenrobot:greendao-generator:3.2.2' implementation 'org.greenrobot:greendao-generator:3.2.2'
implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"] implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"]
implementation files('libs/ecracalib.jar')
implementation files('libs/nexgon5lib.jar') implementation files('libs/nexgon5lib.jar')
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/base/adapter/print/KitChenPrintFoodAdapter.java
...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.base.adapter.print; ...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.base.adapter.print;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.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.database.bean.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
import java.util.List; import java.util.List;
...@@ -12,15 +13,15 @@ import androidx.annotation.Nullable; ...@@ -12,15 +13,15 @@ import androidx.annotation.Nullable;
/** /**
* Created by Wyh on 2020/2/20. * Created by Wyh on 2020/2/20.
*/ */
public class KitChenPrintFoodAdapter extends BaseQuickAdapter<Food, BaseViewHolder> { public class KitChenPrintFoodAdapter extends BaseQuickAdapter<OrderDetail, BaseViewHolder> {
public KitChenPrintFoodAdapter(@Nullable List<Food> data) { public KitChenPrintFoodAdapter(@Nullable List<OrderDetail> data) {
super(R.layout.print_kitchen_item_food, data); super(R.layout.print_kitchen_item_food, data);
} }
@Override @Override
protected void convert(BaseViewHolder helper, Food item) { protected void convert(BaseViewHolder helper, OrderDetail item) {
helper.setText(R.id.tv_food_number, item.getNumber() +""); helper.setText(R.id.tv_food_number, item.getNumber() +"");
helper.setText(R.id.tv_food_name, item.getFoodName()); helper.setText(R.id.tv_food_name, item.getName());
} }
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.base.application; ...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.base.application;
import android.content.Context; import android.content.Context;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.common.bean.CurrentAndroidSetting;
import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans; import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans;
import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler; import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
...@@ -20,7 +21,7 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -20,7 +21,7 @@ public class GsaCloudApplication extends BaseApplication {
private static Context mAppContext; private static Context mAppContext;
public static boolean isLogin = false; public static boolean isLogin = false;
public static CurrentAndroidSetting androidSetting; public static CurrentAndroidSetting androidSetting;
public static String userName = ""; public static String userName = "";
@Override @Override
...@@ -34,7 +35,7 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -34,7 +35,7 @@ public class GsaCloudApplication extends BaseApplication {
initGreenDao(); initGreenDao();
AppCrashHandler.getInstance().init(this,"test"); AppCrashHandler.getInstance().init(this, "test");
} }
...@@ -57,7 +58,6 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -57,7 +58,6 @@ public class GsaCloudApplication extends BaseApplication {
} }
//获取登陆token //获取登陆token
public static String getLoginToken(Context context) { public static String getLoginToken(Context context) {
return (String) SPUtils.get(context, UserConstans.token, ""); return (String) SPUtils.get(context, UserConstans.token, "");
...@@ -79,6 +79,14 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -79,6 +79,14 @@ public class GsaCloudApplication extends BaseApplication {
SPUtils.put(context, UserConstans.memberId, memberId); SPUtils.put(context, UserConstans.memberId, memberId);
} }
public static String getMemberName(Context context) {
return (String) SPUtils.get(context, UserConstans.memberName, "");
}
public static void setMemberName(Context context, String memberName) {
SPUtils.put(context, UserConstans.memberName, memberName);
}
public static void setRestaurantId(Context context, int restaurantId) { public static void setRestaurantId(Context context, int restaurantId) {
SPUtils.put(context, UserConstans.restaurantId, restaurantId); SPUtils.put(context, UserConstans.restaurantId, restaurantId);
} }
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
...@@ -78,6 +78,8 @@ public class OrderDetail { ...@@ -78,6 +78,8 @@ public class OrderDetail {
//父級fid //父級fid
private long parentId; private long parentId;
private String printseting;
public OrderDetail() { public OrderDetail() {
} }
...@@ -298,6 +300,14 @@ public class OrderDetail { ...@@ -298,6 +300,14 @@ public class OrderDetail {
this.unit_price = unit_price; this.unit_price = unit_price;
} }
public String getPrintseting() {
return printseting;
}
public void setPrintseting(String printseting) {
this.printseting = printseting;
}
/** /**
* 已送單食品轉換 * 已送單食品轉換
* *
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/PrintUtils.java
...@@ -19,6 +19,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; ...@@ -19,6 +19,8 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
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.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.gingersoft.gsa.cloud.database.bean.Food;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -189,7 +191,7 @@ public class PrintUtils { ...@@ -189,7 +191,7 @@ public class PrintUtils {
* @param context * @param context
* @return * @return
*/ */
public static Bitmap getKitChenPrintBitmap(Context context, List<Food> foodList) { public static Bitmap getKitChenPrintBitmap(Context context, List<OrderDetail> foodList) {
View view = LinearLayout.inflate(context, R.layout.print_kitchen, null); View view = LinearLayout.inflate(context, R.layout.print_kitchen, null);
TextView tvTableNumber = view.findViewById(R.id.tv_kitchen_print_table_number); TextView tvTableNumber = view.findViewById(R.id.tv_kitchen_print_table_number);
TextView tvOpeningTime = view.findViewById(R.id.tv_opening_time); TextView tvOpeningTime = view.findViewById(R.id.tv_opening_time);
...@@ -206,14 +208,14 @@ public class PrintUtils { ...@@ -206,14 +208,14 @@ public class PrintUtils {
//廚房位置 //廚房位置
tvKitChenLocation.setText(foodList.get(0).getPrintseting()); tvKitChenLocation.setText(foodList.get(0).getPrintseting());
} }
if (OpenTableContract.getDefault().getTableBean() != null) { if (OpenTableManage.getDefault().getTableBean() != null) {
// 台號 // 台號
tvTableNumber.setText(OpenTableContract.getDefault().getTableBean().getTableName() + ""); tvTableNumber.setText(OpenTableManage.getDefault().getTableBean().getTableName() + "");
tvTableNumber2.setText(OpenTableContract.getDefault().getTableBean().getTableName() + ""); tvTableNumber2.setText(OpenTableManage.getDefault().getTableBean().getTableName() + "");
//人數 //人數
tvPeople.setText(OpenTableContract.getDefault().getTableBean().getPeopleNumber() + ""); tvPeople.setText(OpenTableManage.getDefault().getPeopleNumber() + "");
//開台時間 //開台時間
Date time = new Date(OpenTableContract.getDefault().getTableBean().getCreateTime()); Date time = new Date(OpenTableManage.getDefault().getTableBean().getCreateTime());
SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm"); SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
tvOpeningTime.setText(sdf.format(time)); tvOpeningTime.setText(sdf.format(time));
} }
......
public-base/src/main/res/values/colors.xml
...@@ -413,4 +413,6 @@ ...@@ -413,4 +413,6 @@
<color name="hint_color">#676767</color> <color name="hint_color">#676767</color>
<color name="main_home_function_head_bg">#F4F4F4</color> <color name="main_home_function_head_bg">#F4F4F4</color>
</resources> </resources>
table-mode/build.gradle
...@@ -70,5 +70,4 @@ dependencies { ...@@ -70,5 +70,4 @@ dependencies {
// releaseImplementation rootProject.ext.dependencies["canary-release"] // releaseImplementation rootProject.ext.dependencies["canary-release"]
// testImplementation rootProject.ext.dependencies["canary-release"] // testImplementation rootProject.ext.dependencies["canary-release"]
implementation files('libs/ecracalib.jar') implementation files('libs/ecracalib.jar')
implementation files('libs/nexgon5lib.jar')
} }
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/app/payment/callback/CommandImpl.java
...@@ -2,7 +2,6 @@ package com.gingersoft.gsa.cloud.table.app.payment.callback; ...@@ -2,7 +2,6 @@ package com.gingersoft.gsa.cloud.table.app.payment.callback;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.util.Log; import android.util.Log;
import com.elvishew.xlog.XLog; import com.elvishew.xlog.XLog;
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
package com.gingersoft.gsa.cloud.table.mvp.presenter; package com.gingersoft.gsa.cloud.table.mvp.presenter;
import android.app.Application; import android.app.Application;
import android.content.Intent; import android.graphics.Color;
import android.graphics.Bitmap;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
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.OrderBean; 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.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableContract; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.PrintUtils; import com.gingersoft.gsa.cloud.database.bean.Combo;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.database.bean.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils; import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract; import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.OrderRequest; import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.OrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.model.constant.MealConstant; import com.gingersoft.gsa.cloud.table.mvp.model.constant.MealConstant;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.ComboAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.FoodAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.utils.RxLifecycleUtils; import com.jess.arms.utils.RxLifecycleUtils;
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;
...@@ -362,7 +363,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -362,7 +363,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
/** /**
* 打印上菜紙 * 打印上菜紙
*/ */
private void printSendOrder(List<Food> newFoods) { private void printSendOrder(List<OrderDetail> newFoods) {
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam("NewFoods", newFoods) .addParam("NewFoods", newFoods)
......
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