Skip to content

S
supplier
Commit 11a0c395 by 宁斌
Options

打印日志补全 日志上传接口调整为HKTest 餐台模式子项排序条件新增CreateTime

parent 7678dfd3
Showing with 83 additions and 120 deletions
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -236,9 +236,9 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_password, "修改密碼"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "設置"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "查看日誌"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "上傳日誌"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "切換環境"));
}
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "上傳日誌"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_settlement_report, "清機"));
if (AppDevices.isHywebPos()) {
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_settlement_report, "N5清機"));
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
......@@ -87,7 +87,6 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
return MealConditionFilterUtils.foodConditionFilter(foods,foodSummary);
}
@Override
public List<Modifier> queryDB_ModifierList(long fid, int mode) {
ModifierDaoUtils daoUtils = new ModifierDaoUtils(mApplication);
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/CancelFoodDialog.java
......@@ -7,9 +7,11 @@ import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.FoodReasonAdapter;
......@@ -18,6 +20,7 @@ import com.google.android.flexbox.FlexDirection;
import com.google.android.flexbox.FlexWrap;
import com.google.android.flexbox.FlexboxLayoutManager;
import com.google.android.flexbox.JustifyContent;
import com.google.android.material.slider.Slider;
import com.qmuiteam.qmui.layout.QMUILinearLayout;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUIEmptyView;
......@@ -35,7 +38,7 @@ import java.util.List;
* 修订历史：2020-03-28
* 描述：
*/
public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Callback {
public class CancelFoodDialog extends BaseRetryDialog implements Slider.OnSliderTouchListener {
private static final String TAG = "CancelFoodDialog";
......@@ -49,11 +52,11 @@ public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Call
/***
* 可取消最大數
*/
private int maxCancelNumber = 10;
private int mMaxCancelNumber = 10;
/**
* 當前選擇的取消數
*/
private int cancelNumber = 1;
private int mCurrCancelNumber = 1;
/**
* 取消原因數據
*/
......@@ -64,7 +67,7 @@ public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Call
private QMUITopBar mTopBar;
private QMUIRoundButton btn_all_number;
private QMUISlider slider_food_count;
private Slider slider_food_count;
private TextView tv_number_value, tv_max_number, tv_min_number;
private QMUIEmptyView mEmptyView;
......@@ -103,16 +106,16 @@ public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Call
mItems.addAll(items);
}
public void setMaxCancelNumber(int maxCancelNumber) {
this.maxCancelNumber = maxCancelNumber;
public void setMaxCancelNumber(int mMaxCancelNumber) {
this.mMaxCancelNumber = mMaxCancelNumber;
}
public void setCancelNumber(int cancelNumber) {
this.cancelNumber = cancelNumber;
public void setCancelNumber(int mCurrCancelNumber) {
this.mCurrCancelNumber = mCurrCancelNumber;
}
public int getCancelNumber() {
return cancelNumber;
return mCurrCancelNumber;
}
public CancelFoodDialog build() {
......@@ -138,16 +141,14 @@ public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Call
recycle_cancel_info = view.findViewById(R.id.recycle_cancel_info);
//設置最大最小取消數
tv_max_number.setText(String.valueOf(maxCancelNumber));
tv_min_number.setText(String.valueOf(cancelNumber));
//設置默認進度
slider_food_count.setCurrentProgress(getCurrentProgress(cancelNumber));
tv_max_number.setText(String.valueOf(mMaxCancelNumber));
tv_min_number.setText(String.valueOf(mCurrCancelNumber));
slider_food_count.setCallback(this);
slider_food_count.addOnSliderTouchListener(this);
btn_all_number.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
slider_food_count.setCurrentProgress(100);
slider_food_count.setValue(mMaxCancelNumber);
}
});
ll_container.setRadiusAndShadow(mRadius, QMUIDisplayHelper.dp2px(mContext, mShadowElevationDp), mShadowAlpha);
......@@ -158,9 +159,11 @@ public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Call
}
public void initParmas() {
cancelNumber = 1;
tv_number_value.setText(String.valueOf(cancelNumber));
slider_food_count.setCurrentProgress(getCurrentProgress(cancelNumber));
mCurrCancelNumber = 1;
tv_number_value.setText(String.valueOf(mCurrCancelNumber));
slider_food_count.setValueFrom(mCurrCancelNumber);
slider_food_count.setValueTo(mMaxCancelNumber);
slider_food_count.setValue(mCurrCancelNumber);
}
private void initTopbar() {
......@@ -192,20 +195,6 @@ public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Call
return flexboxLayoutManager;
}
private int getCurrentProgress(int num) {
if (maxCancelNumber == 0) {
maxCancelNumber = 10;
}
int progress = num * 100 / maxCancelNumber;
return progress;
}
private int getCancelNumberByProgress(int progress) {
//這裡默認進度從1開始
float number = (getCurrentProgress(1) + progress) * maxCancelNumber / 100;
return Math.round(number);
}
public void showEmptyView(boolean isSuccess, int size, Throwable t) {
showEmptyView(isSuccess, size, t, mEmptyView, recycle_cancel_info);
}
......@@ -228,49 +217,23 @@ public class CancelFoodDialog extends BaseRetryDialog implements QMUISlider.Call
return R.layout.table_dialog_cancel_food;
}
@Override
public void onProgressChange(QMUISlider slider, int progress, int tickCount, boolean fromUser) {
if (progress == 0) {
cancelNumber = 1;
tv_number_value.setText(String.valueOf(cancelNumber));
} else if (progress == 100) {
cancelNumber = maxCancelNumber;
tv_number_value.setText(String.valueOf(cancelNumber));
} else {
cancelNumber = getCancelNumberByProgress(progress);
if (cancelNumber == 0) {
cancelNumber = 1;
}
tv_number_value.setText(String.valueOf(cancelNumber));
}
}
@Override
public void onTouchDown(QMUISlider slider, int progress, int tickCount, boolean hitThumb) {
}
@Override
public void onTouchUp(QMUISlider slider, int progress, int tickCount) {
private OnClickListener onClickListener;
public void setOnClickListener(OnClickListener onClickListener) {
this.onClickListener = onClickListener;
}
@Override
public void onStartMoving(QMUISlider slider, int progress, int tickCount) {
public void onStartTrackingTouch(@NonNull Slider slider) {
mCurrCancelNumber = 1;
tv_number_value.setText(String.valueOf(slider.getValue()));
}
@Override
public void onStopMoving(QMUISlider slider, int progress, int tickCount) {
public void onStopTrackingTouch(@NonNull Slider slider) {
}
private OnClickListener onClickListener;
public void setOnClickListener(OnClickListener onClickListener) {
this.onClickListener = onClickListener;
}
public interface OnClickListener {
void onItemClick(FoodReason item, int position, int deleteNumber);
}
......
component-table/src/main/res/layout/table_dialog_cancel_food.xml
......@@ -69,11 +69,20 @@
android:layout_margin="@dimen/dp_8"
android:orientation="vertical">
<com.qmuiteam.qmui.widget.QMUISlider
android:id="@+id/slider_food_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:qmui_slider_bar_progress_color="@color/theme_color" />
<!-- <com.google.android.material.slider.Slider-->
<!-- android:id="@+id/slider_food_count"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:qmui_slider_bar_progress_color="@color/theme_color" />-->
<com.google.android.material.slider.Slider
android:id="@+id/slider_food_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme"
android:valueFrom="0"
android:valueTo="11"
android:stepSize="1" />
<TextView
android:id="@+id/tv_min_number"
......
config.gradle
......@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 29,
//正式版: 1.0.3 3
//內部測試版:1.2.0 20
versionCode : 21,
versionName : "1.2.1"
versionCode : 22,
versionName : "1.2.2"
]
version = [
......
library-common/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
......@@ -348,7 +348,7 @@ public class GsaCloudApplication extends BaseApplication {
@Override
public void onPrinterDataBefore(int orderType, int printType, String printerData, String printerDeviceInfo) {
LoganManager.w_printer(TAG, "打印前--> printerData=" + printerData + " printerDeviceInfo=" + printerDeviceInfo);
LoganManager.w_printer(TAG, "打印前数据--> printerData=" + printerData + " printerDeviceInfo=" + printerDeviceInfo);
}
@Override
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/config/LoganConfig.java
package com.gingersoft.gsa.cloud.common.config;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
/**
* @author : bin
* @create date: 2020-11-05
......@@ -12,7 +14,7 @@ public class LoganConfig {
public static final String EncryptKey16 = "0123456789012345";
public static final String EncryptIV16 = "0123456789012345";
public static final String APP_ID = "gingersoft1008611";
public static final String UPLOAD_LOG_URL = "http://192.168.1.131:8080/logan-web/logan/upload.json";
public static final String UPLOAD_LOG_URL = HttpsConstans.HTTP_ADDRESS_URL_HK+ "/logan-web/logan/upload.json";
/**
* 日誌保留天數
......@@ -28,28 +30,20 @@ public class LoganConfig {
*/
public static final byte NETWORK_LEVLE = 2;
/**
* 數據庫日誌
*/
public static final byte DATABASE_LEVLE = 3;
/**
* 用戶行為日誌(頁面跳轉，交互，觸摸反饋等)
*/
public static final byte ACTION_LEVLE = 4;
public static final byte ACTION_LEVLE = 3;
/**
* 崩潰日誌
*/
public static final byte CRASH_LEVLE = 5;
public static final byte CRASH_LEVLE = 4;
/**
* H5日誌
*/
public static final byte H5_LEVLE = 6;
public static final byte H5_LEVLE = 5;
/**
* native日誌
*/
public static final byte native_LEVLE = 7;
public static final byte native_LEVLE = 6;
/**
* 打印模塊相關日誌
*/
public static final byte PRINTER_LEVLE = 8;
}
library-common/src/main/java/com/gingersoft/gsa/cloud/common/constans/HttpsConstans.java
......@@ -36,7 +36,7 @@ public class HttpsConstans {
//--------------------------------------------其他全局----------------------------------------------------------------------------
private static String HTTP_ADDRESS_URL_FORMAL = "https://m.ricepon.com:8444";//正式服務器
private static String HTTP_ADDRESS_URL_SZ = "http://gingersoft.tpddns.cn:58201";//深圳測試
private static String HTTP_ADDRESS_URL_HK = "http://a.ricepon.com:58201";//香港測試
public static String HTTP_ADDRESS_URL_HK = "http://a.ricepon.com:58201";//香港測試
private static String HTTP_ADDRESS_URL_PRE = "http://prf-m.ricepon.com";//預發佈
public static String CLOUD_GSA_API_PATH = "/ricepon-cloud-gsa/api/";//雲端GSA路徑
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/logan/LoganManager.java
......@@ -47,7 +47,7 @@ public class LoganManager {
}
public static void w_database(String TAG,String log) {
Logan.w(log, LoganConfig.DATABASE_LEVLE);
Logan.w("database-->"+log, LoganConfig.CODE_LEVLE);
// Logan.f();
if (BuildConfig.DEBUG) {
printLog(TAG, log);
......@@ -62,7 +62,7 @@ public class LoganManager {
}
public static void w_printer(String TAG,String log) {
Logan.w(log, LoganConfig.PRINTER_LEVLE);
Logan.w("printer-->"+log, LoganConfig.CODE_LEVLE);
// Logan.f();
printLog(TAG, log);
}
......@@ -106,7 +106,7 @@ public class LoganManager {
}
}
});
LoganManager.w_code(TAG,"upload result, httpCode: " + statusCode + ", details: " + resultData);
LoganManager.w_code(TAG,"上傳日誌到服務器: " + statusCode + ", details: " + resultData);
}
});
}
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/printer/PrinterFileUtils.java
......@@ -28,7 +28,7 @@ public class PrinterFileUtils {
public static final int PRINTER_KEEP_FILE_SIZE = 20 * 1024 * 1024;
//根目錄
public static String PrinterImagesRootPath = "PrinterImages";
public static final String PrinterImagesRootPath = "PrinterImages";
/**
* 廚房單
* 堂食結賬單
......@@ -39,14 +39,14 @@ public class PrinterFileUtils {
* 外送結賬單
* 清機單
*/
public static String KitchenImage = "KitchenImages";
public static String PrintOrderImage = "PrintOrderImages";
public static String BillImage = "BillImages";
public static String ServingPaperImage = "ServingPaperImages";
public static String QrcodeImage = "QrcodeImages";
public static String DeliveryPrintOrderImage = "DeliveryPrintOrderImages";
public static String DeliveryBillImage = "DeliveryBillImages";
public static String SettlementImage = "SettlementImages";
public static final String KitchenImage = "廚房單";
public static final String PrintOrderImage = "堂食印單";
public static final String BillImage = "堂食結賬單";
public static final String ServingPaperImage = "上菜紙";
public static final String QrcodeImage = "Qrcode";
public static final String DeliveryPrintOrderImage = "外賣印單";
public static final String DeliveryBillImage = "外賣結賬單";
public static final String SettlementImage = "清機";
public final static String ROOT_PATH = FileUtils.ALBUM_PATH + PrinterImagesRootPath + File.separator;
public final static String KITCHEN_PRJ_IMAGE_PATH = ROOT_PATH + KitchenImage + File.separator;
......@@ -66,12 +66,12 @@ public class PrinterFileUtils {
if (TextUtils.isEmpty(savePath)) {
return null;
}
LoganManager.w_printer(TAG, "save path :" + savePath);
File file = new File(ROOT_PATH);
if (file != null && file.exists()) {
long FILE_SIZE = FileUtils.getDirSize(file);
LoganManager.w_printer(TAG, "保存打印圖片到本地 path = " + savePath);
File rootFileDir = new File(ROOT_PATH);
if (rootFileDir != null && rootFileDir.exists()) {
long FILE_SIZE = FileUtils.getDirSize(rootFileDir);
if (FILE_SIZE > PRINTER_MAX_FILE_SIZE) {
LoganManager.w_printer(TAG, "delete file before size : " + FILE_SIZE);
LoganManager.w_printer(TAG, "刪除本地打印圖片 before size = " + FILE_SIZE);
//大於100M 就刪除
File prjPath = new File(ROOT_PATH);
if (prjPath.isDirectory()) {
......@@ -80,8 +80,8 @@ public class PrinterFileUtils {
File prjDirectory = prjDirectorys[i];
boolean deleteResult = prjDirectory.delete();
if (deleteResult && FILE_SIZE <= PRINTER_KEEP_FILE_SIZE) {
FILE_SIZE = FileUtils.getFileSize(ROOT_PATH);
LoganManager.w_printer(TAG, "delete file after size : " + FILE_SIZE);
FILE_SIZE = FileUtils.getDirSize(rootFileDir);
LoganManager.w_printer(TAG, "刪除本地打印圖片 after size = " + FILE_SIZE);
break;
}
}
......@@ -90,17 +90,17 @@ public class PrinterFileUtils {
}
for (Bitmap bitmap : bitmaps) {
String fileName = directoryName + "-" + System.currentTimeMillis();
LoganManager.w_printer(TAG, "saveBitmap fileName : " + fileName);
LoganManager.w_printer(TAG, "fileName : " + fileName);
BitmapUtil.saveBitmap(bitmap, savePath + directoryName + File.separator, fileName + ".jpeg", new BitmapUtil.OnSaveBitmapListener() {
@Override
public void onSuccess() {
LoganManager.w_printer(TAG, "saveBitmap onSuccess");
LoganManager.w_printer(TAG, "保存打印圖片成功");
}
@Override
public void onError(Exception e) {
LoganManager.w_printer(TAG, "saveBitmap onError ：" + e.getMessage());
LoganManager.w_printer(TAG, "保存打印圖片失敗 onError ：" + e.getMessage());
}
});
}
......
library-database/src/main/java/com/gingersoft/gsa/cloud/database/utils/ComboItemDaoUtils.java
......@@ -170,7 +170,7 @@ public class ComboItemDaoUtils {
// }
if (fid > 0) {
sql = sql + " where r.FID='" + fid + "' order by c.SEQ_NO asc";
sql = sql + " where r.FID='" + fid + "' order by c.SEQ_NO,f.CREATE_TIME desc";
}
Cursor c = mManager.getDaoSession().getFoodDao().getDatabase().rawQuery(sql, null);
while (c.moveToNext()) {
......
library-print/src/main/java/com/gingersoft/gsa/cloud/print/PrintSocketHolder.java
......@@ -129,7 +129,7 @@ public class PrintSocketHolder {
out.write(item);
out.flush();
} catch (IOException e) {
LoganManager.w_printer(TAG, "-->打印异常: " + e.getMessage());
LoganManager.w_printer(TAG, "打印异常: " + e.getMessage());
closeSocket();
return ERROR_4;
}
......@@ -165,7 +165,7 @@ public class PrintSocketHolder {
}
public int prepareSocket() {
LoganManager.w_printer(TAG, "-->准备尝试连接打印机");
LoganManager.w_printer(TAG, "准备尝试连接打印机");
int create = createSocket();
if (create != PrintSocketHolder.ERROR_0) {
return create;
......@@ -183,7 +183,7 @@ public class PrintSocketHolder {
* 销毁
*/
public int closeSocket() {
LoganManager.w_printer(TAG, "-->準備关闭打印机连接");
LoganManager.w_printer(TAG, "準備关闭打印机连接");
onPrinterStateChanged(STATE_4);
boolean error = false;
try {
......@@ -192,7 +192,7 @@ public class PrintSocketHolder {
out = null;
}
} catch (IOException e) {
LoganManager.w_printer(TAG, "-->关闭打印机连接异常");
LoganManager.w_printer(TAG, "关闭打印机连接异常");
out = null;
error = true;
}
......@@ -202,7 +202,7 @@ public class PrintSocketHolder {
socket = null;
}
} catch (IOException e) {
LoganManager.w_printer(TAG, "-->关闭打印机连接异常");
LoganManager.w_printer(TAG, "关闭打印机连接异常");
socket = null;
error = true;
}
......@@ -212,7 +212,7 @@ public class PrintSocketHolder {
bluetoothSocket = null;
}
} catch (IOException e) {
LoganManager.w_printer(TAG, "-->关闭打印机连接异常");
LoganManager.w_printer(TAG, "关闭打印机连接异常");
bluetoothSocket = null;
error = true;
}
......
library-print/src/main/java/com/gingersoft/gsa/cloud/print/newprint/PrintUtil.java
......@@ -81,11 +81,9 @@ public class PrintUtil {
private boolean sendData(List<byte[]> data) {
if (holder.sendData(data) == PrintSocketHolder.ERROR_0) {
LoganManager.w_printer(TAG,"PrintTask sendData(List<byte[]> data) -------------打印完成------------------>");
time = 0;
return true;
} else {
LoganManager.w_printer(TAG,"PrintTask sendData(List<byte[]> data) -------------递归打印------------------>");
return prepareSocket() && sendData(data);
}
}
......
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