Skip to content

S
supplier
Commit 013a3e91 by Wyh
Options

6.03 去掉log日誌

parent 50628e65
Showing with 182 additions and 105 deletions
arms/src/main/java/com/jess/arms/http/log/DefaultFormatPrinter.java
......@@ -173,7 +173,6 @@ public class DefaultFormatPrinter implements FormatPrinter {
int end = (i + 1) * MAX_LONG_SIZE;
end = end > line.length() ? line.length() : end;
Timber.tag(tag).i(DEFAULT_LINE + line.substring(start, end));
Log.e("aaa", "" + DEFAULT_LINE + line.substring(start, end));
}
}
}
......
base-module/src/main/java/com/gingersoft/gsa/cloud/aspectj/SingleClickAspect.java
......@@ -33,7 +33,6 @@ public class SingleClickAspect {
@Around("methodAnnotated()")
public void aroundJoinPoint(ProceedingJoinPoint joinPoint) throws Throwable {
// 取出方法的参数
Log.e("eee", "執行aroundJoinPoint");
View view = null;
for (Object arg : joinPoint.getArgs()) {
if (arg instanceof View) {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
......@@ -257,7 +257,6 @@ public class OkHttp3Utils {
token = Aes.aesEncrypt("9_" + memberId + "_" + System.currentTimeMillis() + "_" + loginToken);
token = token.replaceAll("\r|\n", "");
builder.set("token", token);
Log.e("eee", "TOKEN：" + token);
}
Request request1 = chain.request().newBuilder().headers(builder.build()).build();
return chain.proceed(request1);
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyGlobalHttpHandler.java
......@@ -49,9 +49,6 @@ public class MyGlobalHttpHandler implements GlobalHttpHandler {
}
if (GsaCloudApplication.isLogin)
builder.set("token", token);
Log.e("eee", token + "統一請求onHttpRequestBefore" + chain.request().url());
// builder.set("Domain-Name", "common");
return chain.request().newBuilder()
.headers(builder.build())
......
base-module/src/main/java/com/gingersoft/gsa/cloud/print/PrintSocketHolder.java
......@@ -84,11 +84,11 @@ public class PrintSocketHolder {
//设置 超时时间
socket.setSoTimeout(PrintConstans.SO_TIMEOUT);
socket.connect(socketAddress, PrintConstans.PRINT_TIMEOUT);//开始连接ip
Log.e("eee", "連接狀態：" + socket.isConnected());
// Log.e("eee", "連接狀態：" + socket.isConnected());
}
} catch (Exception e) {
closeSocket();
Log.e("eee", "連接報錯：" + e.getMessage());
// Log.e("eee", "連接報錯：" + e.getMessage());
e.printStackTrace();
return ERROR_2;
}
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/SalesFragment.java
......@@ -299,7 +299,6 @@ public class SalesFragment extends BaseFragment<SalesPresenter> implements Sales
//金額佔比
float money = MoneyUtil.divide(info.get(i).getAmount(), totalAmount, 2, ROUND_HALF_UP);
if (money > 0.03) {
Log.e("eee", "食品名：" + info.get(i).getProductName());
entries.add(new PieEntry(money, info.get(i).getProductName()));
}
}
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/WeatherRepository.kt
......@@ -5,6 +5,7 @@ import com.gingersoft.gsa.other_order_mode.data.network.CoolWeatherNetwork
import com.google.gson.Gson
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import okhttp3.Dispatcher
import okhttp3.FormBody
import okhttp3.RequestBody
import kotlin.Pair as Pair1
......@@ -136,6 +137,14 @@ class WeatherRepository private constructor(private val network: CoolWeatherNetw
network.cancelOrder(getBody("memberId" to memberId, "orderId" to orderId, "status" to status, "type" to "2", "updateBy" to updateBy))
}
suspend fun getCancelReason(restaurantId: String, type: String) = withContext(Dispatchers.IO) {
val requestBody = FormBody.Builder()
.add("restaurantId", restaurantId)
.add("type", type)//取消原因類型，1食品取消，2，物流取消，3，訂單取消
.build()
network.getCancelReason(requestBody)
}
fun getBody(vararg pair: Pair1<String, String>): RequestBody {
val requestBody = FormBody.Builder()
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/CancelReason.kt 0 → 100644
package com.gingersoft.gsa.other_order_mode.data.model.bean
data class CancelReason(
val `data`: List<DataX>,
val success: Boolean,
val sysTime: Long
){
data class DataX(
val brandId: Int,
val content: String,
val content2: String,
val content3: String,
val createTime: Int,
val id: Int,
val restaurantId: Int,
val sort: Int,
val type: Int,
val uid: Int,
val updateTime: Int
)
}
\ No newline at end of file
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/CoolWeatherNetwork.kt
......@@ -59,6 +59,8 @@ class CoolWeatherNetwork {
//取消訂單，有物流需要提示先取消物流
suspend fun cancelOrder(requestBody: RequestBody) = service.cancelOrder(requestBody).await()
//獲取商家配置的取消訂單的原因
suspend fun getCancelReason(requestBody: RequestBody) = service.getCancelReason(requestBody).await()
private suspend fun <T> Call<T>.await(): T {
return suspendCoroutine { continuation ->
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/WeatherService.kt
......@@ -50,4 +50,9 @@ interface WeatherService {
@POST("order/updateOrderStatus")
fun cancelOrder(@Body requestBody: RequestBody): Call<CancelLogisticsBean>
@POST("restaurantFoodReason/config/list")
fun getCancelReason(@Body requestBody: RequestBody): Call<CancelReason>
}
\ No newline at end of file
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/HistoryOrderViewModel.kt
package com.gingersoft.gsa.other_order_mode.model.viewModel
import android.content.Context
import android.util.Log
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.constans.PrintConstans
import com.gingersoft.gsa.cloud.print.bean.OrderDetails
import com.gingersoft.gsa.other_order_mode.data.HistoryOrderRepository
import com.gingersoft.gsa.other_order_mode.data.model.bean.HistoryOrderBean
import com.gingersoft.gsa.other_order_mode.data.model.bean.OrderList
import kotlinx.coroutines.launch
class HistoryOrderViewModel(private val historyOrderRepository: HistoryOrderRepository) : ViewModel() {
......@@ -58,6 +64,46 @@ class HistoryOrderViewModel(private val historyOrderRepository: HistoryOrderRepo
})
}
fun printOrder(context: Context, data: HistoryOrderBean.DataBean, listener: (Boolean) -> Unit) {
launch({
getOrderInfo(data.Id.toString()) {
printOrder(it, data, context, listener)
}
}, {
listener.invoke(false)
})
}
/**
* 打印訂單
*/
private fun printOrder(orderDetails: OrderDetails, data: HistoryOrderBean.DataBean, context: Context, listener: (Boolean) -> Unit) {
if (orderDetails.data != null) {
//訂單信息和廚房單
orderDetails.data!![0].order_type = data.order_type
orderDetails.data!![0].orderPayType = data.orderPayType
MyOrderManage.setDataBean(orderDetails.data!![0])
CC.obtainBuilder("Component.Print")
.addParam(PrintConstans.PRINT_TYPE, 5)
.setActionName("printActivity")
.build()
.callAsyncCallbackOnMainThread { _, result ->
Log.e("error", "是否成功打印：" + result.isSuccess)
if (!result.isSuccess) {
ToastUtils.show(context, "打印失敗")
listener.invoke(false)
} else {
listener.invoke(true)
}
MyOrderManage.setDataBean(null)
}
} else {
ToastUtils.show(context, "沒有訂單內容,打印失敗")
listener.invoke(false)
}
}
private fun launch(block: suspend () -> Unit, error: suspend (Throwable) -> Unit) = viewModelScope.launch {
try {
block()
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
......@@ -155,7 +155,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
//移除掉最後一個對象
myData.removeAt(myData.size - 1)
//如果是加載更多
Log.e("eee", "加載更多$isLoadMore")
if (isLoadMore) {
if (mOrderList[position].value != null) {
mOrderList[position].value!!.addAll(myData)
......@@ -595,6 +594,16 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
})
}
fun getCancelReason(restaurantId: String, type: String){
launch({
repository.getCancelReason(restaurantId, type).apply {
}
},{
})
}
private fun launch(block: suspend () -> Unit, error: suspend (Throwable) -> Unit) = viewModelScope.launch {
try {
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/HistoryOrderActivity.kt
......@@ -32,6 +32,9 @@ class HistoryOrderActivity : BaseActivity() {
lateinit var rvOrderList: RecyclerView
lateinit var layoutNoData: View
lateinit var time:String
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_history_order)
......@@ -41,35 +44,45 @@ class HistoryOrderActivity : BaseActivity() {
tv_start_time.text = TimeUtils.getOldDate(0)
tv_end_time.text = TimeUtils.getOldDate(0)
time = TimeUtils.getOldDate(0)
initAppTop()
rvOrderList.layoutManager = LinearLayoutManager(this)
initViewModel()
getHistoryInfo(time = tv_start_time.text.toString())
getHistoryInfo()
initSearch()
initRefresh()
}
private fun getHistoryInfo(page: Int = pageIndex, orderNum: String = "", time: String) {
private fun getHistoryInfo(page: Int = pageIndex, orderNum: String = "") {
showLoading()
mViewModel.getHistoryOrderList(this, page.toString(), orderNum, time, time) {
mViewModel.getHistoryOrderList(this, page.toString(), orderNum, time, time) { it ->
cancelDialogForLoading()
it?.let {
it?.let { it ->
refreshLayout.setEnableLoadMore(it.getData() != null)
refreshLayout.finishRefresh()
refreshLayout.finishLoadMore()
if (mHistoryOrderAdapter == null) {
mHistoryOrderAdapter = it.getData()?.let { it1 -> HistoryOrderAdapter(this@HistoryOrderActivity, it1) }
rvOrderList.adapter = mHistoryOrderAdapter
mHistoryOrderAdapter!!.setOnItemClickListenter {
mHistoryOrderAdapter!!.setOnItemClickListenter { it ->
showLoading()
mViewModel.getOrderInfo(it.Id.toString()) { it2 ->
cancelDialogForLoading()
if (it2.data != null && it2.data!!.isNotEmpty()) {
//顯示彈窗
OtherOrderUtils.showOrderDetailsDialog(this@HistoryOrderActivity, it2, it.STATUS, it.order_type, false) { view, _, _ ->
//確認訂單、指派送貨點擊事件
OtherOrderUtils.showOrderDetailsDialog(this@HistoryOrderActivity, it2, it.STATUS, it.order_type, true) { view, _, _ ->
//重印
showLoading()
mViewModel.printOrder(this@HistoryOrderActivity, it){
cancelDialogForLoading()
if(it){
ToastUtils.show(this@HistoryOrderActivity, "打印成功")
} else {
ToastUtils.show(this@HistoryOrderActivity, "打印失敗")
}
}
}
} else {
ToastUtils.show(this, "未查詢到訂單信息")
......@@ -91,9 +104,10 @@ class HistoryOrderActivity : BaseActivity() {
private fun initSearch() {
iv_search_order.setOnClickListener {
time = ""
//搜索
if (ed_order_num_search.text != null && ed_order_num_search.text.isNotEmpty()) {
getHistoryInfo(1, ed_order_num_search.text.toString(), "")
getHistoryInfo(1, ed_order_num_search.text.toString())
} else {
ToastUtils.show(this@HistoryOrderActivity, "請輸入手機號或訂單號")
}
......@@ -106,11 +120,11 @@ class HistoryOrderActivity : BaseActivity() {
//下拉刷新，加載更多
refreshLayout.setOnRefreshListener {
pageIndex = 1
getHistoryInfo(time = tv_start_time.text.toString())
getHistoryInfo()
}
refreshLayout.setOnLoadMoreListener {
pageIndex++
getHistoryInfo(time = tv_start_time.text.toString())
getHistoryInfo()
}
}
......@@ -133,10 +147,11 @@ class HistoryOrderActivity : BaseActivity() {
}
TimePickerUtils.showReportTimePicker(this@HistoryOrderActivity, cal) { date, v ->
tv_start_time.text = TimeUtils.DATE_FORMAT_DATE.format(date)
time = TimeUtils.DATE_FORMAT_DATE.format(date)
pageIndex = 1
getHistoryInfo()
}.setOnDismissListener {
iv_start_time_triangle.toggle()
pageIndex = 1
getHistoryInfo(time = tv_start_time.text.toString())
}
}
// R.id.tv_end_time, R.id.iv_end_time_triangle -> {
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OtherOrderActivity.kt
......@@ -62,6 +62,7 @@ class OtherOrderActivity : BaseActivity() {
private var titles: ArrayList<TextView> = ArrayList()
private var layoutHeight: Float = 0F
private var btnHeight: Float = 0F
private var selectPosition = 0
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
......@@ -75,6 +76,19 @@ class OtherOrderActivity : BaseActivity() {
val sectionsPagerAdapter = SectionsPagerAdapter(this, supportFragmentManager, ints)
view_pager.adapter = sectionsPagerAdapter
view_pager.offscreenPageLimit = 4
view_pager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
override fun onPageScrollStateChanged(state: Int) {
}
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
}
override fun onPageSelected(position: Int) {
selectPosition = position
}
})
searchMethod(view_pager)
initTabs()
......@@ -257,18 +271,16 @@ class OtherOrderActivity : BaseActivity() {
bind.setOnPostCallBack(object : GetInfoUpdateService.PostCallBack {
override fun callBack(type: Int) {
//-1斷開連接,\n-2:消息傳輸錯誤,\n0:連接消息,\n1：登錄通知,\n2：登出通知,\n3：外賣送單通知,\n4：自取送單通知,\n5:歷史訂單通知,\n6:修改訂單狀態通知,\n7:支付成功通知"
Log.e("eee", "消息：$type")
if (type == 3 || type == 4 || type == 5
|| type == 6 || type == 7) {
//播放提示音
if (type == 5 || type == 4) {
pageViewModel.refreshState.postValue(1)
if (type == 6 || type == 7) {
} else {
pageViewModel.refreshState.postValue(type)
// pageViewModel.getOrderGroupNum(GsaCloudApplication.getRestaurantId(this))
}
//播放提示音
initSoundPool()
}
pageViewModel.refreshState.postValue(selectPosition)
}
}
})
}
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt
......@@ -42,8 +42,11 @@ class PlaceholderFragment : BaseFragment() {
// 觸發刷新，判斷是否更新
// 並且type一致
//如果當前fragment的狀態中包含需要刷新的狀態，獲取數據
Log.e("eee", "是否顯示：$isHidden + $it,當前fragment的" + PageViewModel.fragmentStatus[arguments?.getInt(INDEX)!!])
if (PageViewModel.fragmentStatus[arguments?.getInt(INDEX)!!].contains(it.toString()) || !isHidden) {
// if (PageViewModel.fragmentStatus[arguments?.getInt(INDEX)!!].contains(it.toString())) {
// page = 1
// getOrderList(this, false)
// }
if (arguments?.getInt(INDEX) == it) {
page = 1
getOrderList(this, false)
}
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/OtherOrderUtils.kt
......@@ -17,7 +17,7 @@ import com.jess.arms.utils.ArmsUtils
object OtherOrderUtils {
fun showOrderDetailsDialog(context: Context, data: OrderDetails, orderStuats: Int, orderType: Int, showBtn: Boolean = true, listenter: ((view: View, data: OrderDetails.DataBean, dialog: Dialog) -> Unit)?) {
fun showOrderDetailsDialog(context: Context, data: OrderDetails, orderStuats: Int, orderType: Int, isHistory: Boolean = false, listenter: ((view: View, data: OrderDetails.DataBean, dialog: Dialog) -> Unit)?) {
object : DialogUtils(context, R.layout.layout_order_info_dialog_new) {
override fun initLayout(hepler: ViewHepler, dialog: Dialog) {
if (data.data != null) {
......@@ -27,9 +27,9 @@ object OtherOrderUtils {
layoutOrderInfoDialogBinding.data = orderData
layoutOrderInfoDialogBinding.isSelf = orderType == 7
layoutOrderInfoDialogBinding.totalAmount = orderData.TOTAL_AMOUNT!!.toDouble()
//如果有物流號，就不顯示指派送貨按鈕
layoutOrderInfoDialogBinding.showBtn = showBtn
val btnContent: String
//是歷史訂單，就不顯示訂單狀態
layoutOrderInfoDialogBinding.isHistory = isHistory
var btnContent =""
var cancelBtnContent = ""
val type = if (orderType == 7) "自取" else "外送"
......@@ -82,8 +82,9 @@ object OtherOrderUtils {
else -> ""
}
if (!showBtn) {
if (isHistory) {
cancelBtnContent = ""
btnContent = "重印"
}
layoutOrderInfoDialogBinding.orderStatus = type + orderStatus
layoutOrderInfoDialogBinding.btnContent = btnContent
......
other_order_mode/src/main/res/layout/layout_order_info_dialog_new.xml
......@@ -28,6 +28,10 @@
type="String" />
<variable
name="isHistory"
type="Boolean" />
<variable
name="cancelBtnContent"
type="String" />
......@@ -36,10 +40,6 @@
type="String" />
<variable
name="showBtn"
type="Boolean" />
<variable
name="patMethod"
type="String" />
......@@ -81,11 +81,10 @@
android:text="@{orderStatus}"
android:textColor="#009788"
android:textSize="@dimen/dp_15"
android:visibility="@{showBtn?View.VISIBLE:View.INVISIBLE}"
android:visibility="@{isHistory?View.INVISIBLE:View.VISIBLE}"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
android:id="@+id/scroll_order_info"
android:layout_width="match_parent"
......@@ -618,7 +617,7 @@
android:text="@{btnContent}"
android:textColor="@color/white"
android:textSize="@dimen/dp_16"
android:visibility="@{showBtn?View.VISIBLE:View.GONE}"
android:visibility="@{(btnContent==null||btnContent.length()==0)?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf="@id/btn_cancel_order"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
......
print-module/src/main/java/com/joe/print/PrintComponent.java
......@@ -60,7 +60,6 @@ public class PrintComponent implements IComponent {
return print(cc);
case "openPrintService":
//打開打印服務
Log.e("eee", "PrintComponent打開打印服務");
Intent intent = new Intent(cc.getContext(), PrjService.class);
cc.getContext().startService(intent);
CC.sendCCResult(cc.getCallId(), CCResult.success());
......
print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
......@@ -222,19 +222,16 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
@Override
public void onReturnString(String result) {
//部分接⼝会异步返回查询数据
Log.e("eee", "onReturnString：" + result);
}
@Override
public void onRaiseException(int code, String msg) {
//接⼝执⾏失败时，返回的异常状态
Log.e("eee", "打印異常狀態碼：" + code + "---MSG:" + msg);
}
@Override
public void onPrintResult(int code, String msg) {
//事务模式下真实的打印结果返回
Log.e("eee", "打印結果：" + code + "---MSG:" + msg);
}
});
}
......@@ -495,24 +492,18 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
public void onResult(int errorCode, PrinterDeviceBean printerDeviceBean) {
switch (errorCode) {
case PrintSocketHolder.ERROR_0:
Log.e("eee", "打印成功");
cutPrintSize();
break;
case PrintSocketHolder.ERROR_1:
Log.e("eee", "生成測試頁面數據失敗");
break;
case PrintSocketHolder.ERROR_2:
Log.e("eee", "連接打印機失敗" + System.currentTimeMillis());
case PrintSocketHolder.ERROR_3:
Log.e("eee", "獲取輸出流失敗");
printerFileDevices.add(printerDeviceBean);
cutPrintSize();
break;
case PrintSocketHolder.ERROR_4:
Log.e("eee", "寫入測試頁面數據失敗");
break;
case PrintSocketHolder.ERROR_5:
Log.e("eee", "必要的參數不能為空");
break;
}
setPrintState(errorCode);
......@@ -530,10 +521,8 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
}
private void cutPrintSize() {
Log.e("eee", "個數：" + printSize);
printSize--;
if (printSize <= 0) {
Log.e("eee", "打印完了" + printerFileDevices.size());
//全部打印完了
if (printerFileDevices != null && printerFileDevices.size() > 0) {
//有打印失敗的.關閉activity中的加載框
......@@ -607,7 +596,6 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
// ToastUtils.show(mContext, "打印失敗");
} else {
//都打印成功了
Log.e("eee", "打印成功");
printListener.printSuccess();
}
}
......
print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java
......@@ -117,7 +117,6 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
@Override
public void onNext(String s) {
Log.e("eee", "數據" + s);
//請求到數據，停止輪詢，開始打印，在打印完之後再重新開始輪詢
startPrint(s);
//開啟另一個定時，三十秒之後自動請求，避免上面的打印成功或失敗時沒有回調。
......@@ -147,7 +146,6 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
@Override
public void onError(Throwable e) {
Log.e("eee", "報錯：" + e.getMessage());
}
@Override
......@@ -174,7 +172,6 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
private void startPrint(String json) {
printDatas.clear();
PrjBean prjBean = JsonUtils.parseObject(json, PrjBean.class);
Log.e("eee", "打開打印服務" + prjBean.getSysTime());
if (prjBean.getData() == null) {
return;
}
......@@ -194,7 +191,6 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
PrintPrjKitchen.getPrjMap().put(key, datas);
// }
printDatas.addAll(datas);
Log.e("eee", "個數" + datas.size());
}
} catch (JSONException e) {
e.printStackTrace();
......@@ -209,7 +205,6 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
for (int i = 0; i < printerDeviceBeans.size(); i++) {
//遍歷打印機列表，找到對應的打印機，沒找到的就不打印
if (entry.getKey().equalsIgnoreCase(printerDeviceBeans.get(i).getName())) {
Log.e("eee", "有打印機。。。");
printerInIt.ipDevicePrint(printerDeviceBeans.get(i), entry.getValue(), this, this);
break;
}
......@@ -249,12 +244,10 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
@Override
public void onNext(String s) {
Log.e("eee", "數據" + s);
}
@Override
public void onError(Throwable e) {
Log.e("eee", "報錯：" + e.getMessage());
}
@Override
......@@ -269,72 +262,65 @@ public class PrjService extends Service implements PrintSocketHolder.OnStateChan
String tip = "加載中";
switch (state) {
case PrintSocketHolder.ERROR_0:
Log.e("eee", "打印成功");
// Log.e("eee", "打印成功");
tip = "打印成功";
break;
case PrintSocketHolder.ERROR_1:
Log.e("eee", "生成測試頁面數據失敗");
// Log.e("eee", "生成測試頁面數據失敗");
tip = "生成打印數據失敗";
break;
case PrintSocketHolder.ERROR_2:
Log.e("eee", "連接打印機失敗" + System.currentTimeMillis());
// Log.e("eee", "連接打印機失敗" + System.currentTimeMillis());
case PrintSocketHolder.ERROR_3:
Log.e("eee", "獲取輸出流失敗");
// Log.e("eee", "獲取輸出流失敗");
tip = "連接打印機失敗";
break;
case PrintSocketHolder.ERROR_4:
Log.e("eee", "寫入測試頁面數據失敗");
// Log.e("eee", "寫入測試頁面數據失敗");
tip = "寫入測試頁面數據失敗";
break;
case PrintSocketHolder.ERROR_5:
Log.e("eee", "必要的參數不能為空");
// Log.e("eee", "必要的參數不能為空");
tip = "必要的參數不能為空";
break;
case PrintSocketHolder.STATE_0:
Log.e("eee", "生成測試頁數據");
// Log.e("eee", "生成測試頁數據");
case PrintSocketHolder.STATE_1:
Log.e("eee", "開始創建連接");
// Log.e("eee", "開始創建連接");
tip = "開始創建連接";
break;
case PrintSocketHolder.STATE_2:
Log.e("eee", "創建連接成功，開始發送數據");
// Log.e("eee", "創建連接成功，開始發送數據");
tip = "創建連接成功，開始發送數據";
break;
case PrintSocketHolder.STATE_3:
Log.e("eee", "開始寫入數據");
// Log.e("eee", "開始寫入數據");
tip = "開始寫入數據";
break;
case PrintSocketHolder.STATE_4:
Log.e("eee", "關閉中");
// Log.e("eee", "關閉中");
tip = "關閉中";
break;
}
Log.e("eee", "onStateChanged狀態：" + tip);
}
@Override
public void onResult(int errorCode, PrinterDeviceBean printerDeviceBean) {
switch (errorCode) {
case PrintSocketHolder.ERROR_0:
Log.e("eee", "打印成功");
//更新狀態
updatePrjState(3);
break;
case PrintSocketHolder.ERROR_1:
Log.e("eee", "生成測試頁面數據失敗");
break;
case PrintSocketHolder.ERROR_2:
Log.e("eee", "連接打印機失敗");
//再次打開輪詢
updatePrjState(1);
case PrintSocketHolder.ERROR_3:
Log.e("eee", "獲取輸出流失敗");
break;
case PrintSocketHolder.ERROR_4:
Log.e("eee", "寫入測試頁面數據失敗");
break;
case PrintSocketHolder.ERROR_5:
Log.e("eee", "必要的參數不能為空");
break;
}
}
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/IpPrintActivity.java
......@@ -156,35 +156,29 @@ public class IpPrintActivity extends Activity implements PrintSocketHolder.OnSta
String tip;
switch (errorCode) {
case PrintSocketHolder.ERROR_0:
Log.e("eee", "打印成功");
tip = "打印成功";
printStatus = true;
setLoadingText(tip);
dismiss();
break;
case PrintSocketHolder.ERROR_1:
Log.e("eee", "生成測試頁面數據失敗");
tip = "生成打印數據失敗";
printStatus = false;
setLoadingText(tip);
dismiss();
break;
case PrintSocketHolder.ERROR_2:
Log.e("eee", "連接打印機失敗" + System.currentTimeMillis());
case PrintSocketHolder.ERROR_3:
Log.e("eee", "獲取輸出流失敗");
tip = "連接打印機失敗";
printStatus = false;
setLoadingText(tip);
dismiss();
break;
case PrintSocketHolder.ERROR_4:
Log.e("eee", "寫入測試頁面數據失敗");
tip = "寫入測試頁面數據失敗";
setLoadingText(tip);
break;
case PrintSocketHolder.ERROR_5:
Log.e("eee", "必要的參數不能為空");
tip = "必要的參數不能為空";
setLoadingText(tip);
break;
......@@ -196,21 +190,16 @@ public class IpPrintActivity extends Activity implements PrintSocketHolder.OnSta
String tip = "打印中...";
switch (state) {
case PrintSocketHolder.STATE_0:
Log.e("eee", "生成測試頁數據");
case PrintSocketHolder.STATE_1:
Log.e("eee", "開始創建連接");
tip = "開始創建連接";
break;
case PrintSocketHolder.STATE_2:
Log.e("eee", "創建連接成功，開始發送數據");
tip = "創建連接成功，開始發送數據";
break;
case PrintSocketHolder.STATE_3:
Log.e("eee", "開始寫入數據");
tip = "開始寫入數據";
break;
case PrintSocketHolder.STATE_4:
Log.e("eee", "關閉中");
tip = "關閉中";
break;
}
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
......@@ -178,7 +178,6 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
public void printFile() {
CC.sendCCResult(callId, CCResult.error("print error"));
finish();
Log.e("eee", "打印失敗，關閉頁面");
}
@Override
......@@ -186,43 +185,43 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
String tip = "加載中...";
switch (state) {
case PrintSocketHolder.ERROR_0:
Log.e("eee", "打印成功");
// Log.e("eee", "打印成功");
tip = "打印成功";
break;
case PrintSocketHolder.ERROR_1:
Log.e("eee", "生成測試頁面數據失敗");
// Log.e("eee", "生成測試頁面數據失敗");
tip = "生成打印數據失敗";
break;
case PrintSocketHolder.ERROR_2:
Log.e("eee", "連接打印機失敗" + System.currentTimeMillis());
// Log.e("eee", "連接打印機失敗" + System.currentTimeMillis());
case PrintSocketHolder.ERROR_3:
Log.e("eee", "獲取輸出流失敗");
// Log.e("eee", "獲取輸出流失敗");
tip = "連接打印機失敗";
break;
case PrintSocketHolder.ERROR_4:
Log.e("eee", "寫入測試頁面數據失敗");
// Log.e("eee", "寫入測試頁面數據失敗");
tip = "寫入測試頁面數據失敗";
break;
case PrintSocketHolder.ERROR_5:
Log.e("eee", "必要的參數不能為空");
// Log.e("eee", "必要的參數不能為空");
tip = "必要的參數不能為空";
break;
case PrintSocketHolder.STATE_0:
Log.e("eee", "生成測試頁數據");
// Log.e("eee", "生成測試頁數據");
case PrintSocketHolder.STATE_1:
Log.e("eee", "開始創建連接");
// Log.e("eee", "開始創建連接");
tip = "開始創建連接";
break;
case PrintSocketHolder.STATE_2:
Log.e("eee", "創建連接成功，開始發送數據");
// Log.e("eee", "創建連接成功，開始發送數據");
tip = "創建連接成功，開始發送數據";
break;
case PrintSocketHolder.STATE_3:
Log.e("eee", "開始寫入數據");
// Log.e("eee", "開始寫入數據");
tip = "開始寫入數據";
break;
case PrintSocketHolder.STATE_4:
Log.e("eee", "關閉中");
// Log.e("eee", "關閉中");
tip = "關閉中";
break;
case DIMISS_LOADING:
......@@ -247,7 +246,6 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
CC.sendCCResult(callId, CCResult.success());
disLoadingDialog();
finish();
Log.e("eee", "打印成功，關閉頁面");
}
@Override
......
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