Skip to content

S
supplier
Commit d2117b69 by Wyh
Options

9.30 1、未創建訂單印單失敗問題 

Signed-off-by: Wyh <1239658231>
parent 74eb1901
Showing with 21 additions and 44 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
......@@ -197,12 +197,10 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
@Override
public void onSubscribe(Disposable d) {
Log.e("eee", "onSubscribe");
}
@Override
public void onNext(String data) {
Log.e("eee", "上傳錯誤日誌成功");
if(!TextUtils.isEmpty(data)){
BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
if (result != null && result.isSuccess()) {
......@@ -219,12 +217,10 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
@Override
public void onError(Throwable t) {
XLog.d(TAG, "sendFileMultipart onError: " + t.getMessage());
Log.e("eee", "onError");
}
@Override
public void onComplete() {
Log.e("eee", "onComplete");
}
});
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
package com.gingersoft.gsa.cloud.base.utils.okhttpUtils;
import android.util.Log;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
......@@ -105,7 +103,6 @@ public class OkHttp3Utils {
@Override
public void onResponse(Call call, Response response) throws IOException {
String str = response.body().string();
Log.e("eee", "請求結果：" + str);
emitter.onNext(str);
emitter.onComplete();
call.cancel();
......
config.gradle
......@@ -2,13 +2,13 @@ ext {
android = [
compileSdkVersion: 28,
buildToolsVersion: '29.0.2',
buildToolsVersion: '28.0.3',
minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
targetSdkVersion : 28,
//正式版: 1.0.3 3
//內部測試版:1.2.0 20
versionCode : 9,
versionName : "1.0.9"
versionCode : 8,
versionName : "1.0.8"
]
version = [
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt
......@@ -345,7 +345,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
}, {
listener.invoke(getMsgBean(0, "", false))
it.printStackTrace()
Log.e("eee", it.javaClass.name + "錯誤信息111：" + it.message)
GetInfoUpdateService.loginfo.append("錯誤信息111：" + it.message + " LOCALIZEDMESSAGE：" + it.localizedMessage + it.cause)
GetInfoUpdateService.loginfo.append("\n")
})
......@@ -415,7 +414,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
}, {
listener.invoke(OrderDelivery, false)
it.printStackTrace()
Log.e("eee", "gsUpdateOrderStatus報錯：" + it.message)
// integralBean.postValue(null)
})
}
......@@ -437,7 +435,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
}, {
listener.invoke(OrderDelivery, false)
it.printStackTrace()
Log.e("eee", "gsUpdateOrderStatus報錯：" + it.message)
// integralBean.postValue(null)
})
}
......@@ -481,7 +478,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
GetInfoUpdateService.loginfo.append("\n")
}, {
it.printStackTrace()
Log.e("eee", "錯誤信息222：" + it.message)
GetInfoUpdateService.loginfo.append("錯誤信息222：" + it.message + " LOCALIZEDMESSAGE：" + it.localizedMessage + it.cause)
GetInfoUpdateService.loginfo.append("\n")
})
......@@ -586,7 +582,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
// repository.addPrj("11112364", "153", "48863119")
// }, {
// it.printStackTrace()
// Log.e("eee", "錯誤信息222：" + it.message)
// })
CC.obtainBuilder("Component.Print")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_INSTRUCTION)
......@@ -712,7 +707,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
}
}, {
it.printStackTrace()
Log.e("eee", "confirmBtn報錯：" + it.message)
})
} else {
ToastUtils.show(context, "請至少選擇一個送貨員")
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/PlaceholderFragment.kt
......@@ -144,7 +144,6 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
private fun refresh() {
Log.e("eee", "$position -----" + pageViewModel.refreshState.value)
if (position == pageViewModel.refreshState.value) {
showLoading("獲取數據中...")
page = 1
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/ExpandListAdapter.java
......@@ -105,18 +105,15 @@ public class ExpandListAdapter extends BaseQuickAdapter<ExpandInfo, BaseViewHold
editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
Log.e("eee", "beforeTextChanged——" + s);
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
Log.e("eee", "onTextChanged——" + s);
}
@Override
public void afterTextChanged(Editable s) {
Log.e("eee", "afterTextChanged—" + function.getDataType() + "—" + s);
if (function.getDataType() == 1) {
if (TextUtil.isNotEmptyOrNullOrUndefined(s.toString())) {
function.setValueInt(Integer.parseInt(s.toString()));
......
print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
......@@ -218,7 +218,6 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
@Override
public void onNext(String s) {
Log.e("eee", "打印內容：" + s);
XmlPullParser xmlPullParser = Xml.newPullParser();
try {
xmlPullParser.setInput(new ByteArrayInputStream(s.getBytes()), "utf-8");
......@@ -267,7 +266,6 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
if (e instanceof ConnectException) {
listener.printFile("無法連接打印，請檢查WisePay是否打開");
}
Log.e("eee", "報錯信息：" + e.getMessage());
}
@Override
......@@ -493,27 +491,21 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
public void onResult(int errorCode, PrinterDeviceBean printerDeviceBean) {
switch (errorCode) {
case PrintSocketHolder.ERROR_0:
Log.e("eee", "打印成功");
printSuccess();
break;
case PrintSocketHolder.ERROR_1:
Log.e("eee", "生成測試頁面數據失敗");
printFile("生成打印數據失敗");
break;
case PrintSocketHolder.ERROR_2:
Log.e("eee", "連接打印機失敗");
printFile("連接打印機失敗");
break;
case PrintSocketHolder.ERROR_3:
Log.e("eee", "獲取輸出流失敗");
printFile("連接打印機失敗");
break;
case PrintSocketHolder.ERROR_4:
Log.e("eee", "寫入測試頁面數據失敗");
printFile("連接打印機失敗");
break;
case PrintSocketHolder.ERROR_5:
Log.e("eee", "必要的參數不能為空");
printFile("連接打印機失敗");
break;
}
......@@ -545,7 +537,6 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
@Override
public void onPtrReceive(Printer printer, int i, PrinterStatusInfo printerStatusInfo, String s) {
Log.e("eee", "EPSON打印結果：" + i);
if (printListener != null) {
if (i == 0) {
printSuccess();
......
print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java
......@@ -493,7 +493,6 @@ public class PrjService extends Service implements ReceiveListener {
* ip設備打印
*/
public void ipPrint(PrinterDeviceBean printerDeviceBean, List<Map<String, Bitmap>> bitmapMaps) {
Log.e("eee", "打印次數：" + bitmapMaps.size());
for (int i = 0; i < bitmapMaps.size(); i++) {
PrintExecutor executor = new PrintExecutor(printerDeviceBean);
executor.setOnPrjPrintResultListener((errorCode, ids) -> {
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
......@@ -6,7 +6,6 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
......@@ -16,6 +15,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
......@@ -335,48 +335,37 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
String tip = "加載中...";
switch (state) {
case PrintSocketHolder.ERROR_0:
Log.e("eee", "打印成功");
tip = "打印成功";
setPrintProgress(3);
break;
case PrintSocketHolder.ERROR_1:
Log.e("eee", "生成測試頁面數據失敗");
tip = "生成打印數據失敗";
break;
case PrintSocketHolder.ERROR_2:
Log.e("eee", "連接打印機失敗");
case PrintSocketHolder.ERROR_3:
Log.e("eee", "獲取輸出流失敗");
tip = "連接打印機失敗";
break;
case PrintSocketHolder.ERROR_4:
Log.e("eee", "寫入測試頁面數據失敗");
tip = "寫入測試頁面數據失敗";
break;
case PrintSocketHolder.ERROR_5:
Log.e("eee", "必要的參數不能為空");
tip = "必要的參數不能為空";
break;
case PrintSocketHolder.STATE_0:
Log.e("eee", "生成測試頁數據");
setPrintProgress(0);
break;
case PrintSocketHolder.STATE_1:
Log.e("eee", "開始創建連接");
tip = "開始創建連接";
break;
case PrintSocketHolder.STATE_2:
Log.e("eee", "創建連接成功，開始發送數據");
tip = "創建連接成功，開始發送數據";
setPrintProgress(1);
break;
case PrintSocketHolder.STATE_3:
Log.e("eee", "開始寫入數據");
tip = "開始寫入數據";
setPrintProgress(2);
break;
case PrintSocketHolder.STATE_4:
Log.e("eee", "關閉中");
tip = "關閉中";
finish();
break;
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java
......@@ -61,7 +61,6 @@ public class PrintTestActivity extends AppCompatActivity implements PrintSocketH
@Override
public void onNext(String s) {
Log.e("eee", "打印內容：" + s);
}
@Override
......
table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/model/OrderContentModel.java
package com.gingersoft.gsa.cloud.bean.mvp.model;
import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
......@@ -16,6 +17,7 @@ import com.gingersoft.gsa.cloud.bean.mvp.model.service.TableService;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel;
......@@ -89,7 +91,21 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
if (info != null && info.isSuccess()) {
saveCreateTime(info.getSysTime());
if (info.getData() != null) {
MyOrderManage.getInstance().setOrderId((Double) info.getData());
if (info.getData() instanceof Double) {
//未上線，避免正式版閃退
MyOrderManage.getInstance().setOrderId((Double) info.getData());
MyOrderManage.getInstance().getOrderBean().setOrderNo(((Double) info.getData()).longValue() + "");
} else {
LinkedTreeMap tm = (LinkedTreeMap) info.getData();
for (Object o : tm.keySet()) {
String key = (String) o;
if (key.equals("id")) {
MyOrderManage.getInstance().setOrderId((Double) tm.get(key));
} else if (key.equals("orderNo")) {
MyOrderManage.getInstance().getOrderBean().setOrderNo((String) tm.get(key));
}
}
}
}
return loadOrder(MyOrderManage.getInstance().getOrderId());
}
......
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