Skip to content

S
supplier
Commit 5f8fe0fe by 宁斌
Options

1、餐台 区域添加限制空格 2、Prj打印格式調整 3、堂食Prj打印不了的問題 4、冷鏈訂單號顯示字段改為TakeFoodCode

parent 048529c4
Showing with 646 additions and 89 deletions
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java
......@@ -5,10 +5,12 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.print.PrintManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
......@@ -69,6 +71,8 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
TextView mTvCreateTime;
@BindView(R2.id.tv_receiver)
TextView mTvReceiver;
@BindView(R2.id.rl_bill_num)
RelativeLayout rl_bill_num;
@BindView(R2.id.tv_bill_num)
TextView mTvOrderNum;
@BindView(R2.id.tv_receive_phone)
......@@ -233,10 +237,15 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
}
mTvOrderNo.setText(getResources().getString(R.string.order_no) + bean.getORDER_NO());
mTvCreateTime.setText(getResources().getString(R.string.create_order_time) + TimeUtils.parseTimeRepeat(bean.getCREATE_TIME(), TimeUtils.DEFAULT_DATE_FORMAT));
if(TextUtil.isNotEmptyOrNullOrUndefined(bean.getRECEIVER())) {
if (TextUtil.isNotEmptyOrNullOrUndefined(bean.getRECEIVER())) {
mTvReceiver.setText(bean.getRECEIVER());
}
mTvOrderNum.setText(bean.getBillNo());
if (!TextUtils.isEmpty(bean.getTakeFoodCode()) && !bean.getTakeFoodCode().equals("0")) {
rl_bill_num.setVisibility(View.VISIBLE);
mTvOrderNum.setText(bean.getTakeFoodCode());
} else {
rl_bill_num.setVisibility(View.GONE);
}
mTvReceiverPhone.setText(bean.getPHONE());
mTvReceiverTime.setText(TextUtil.isNotEmptyOrNullOrUndefined(bean.getTakeTime()) ? bean.getTakeTime() : bean.getSEND_TIME());
mTvReceiverAddress.setText(bean.getAddressDetail());
......
component-coldchain/src/main/res/layout/cold_chain_order_details.xml
......@@ -137,6 +137,7 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_bill_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/HistoryOrderAdapter.kt
......@@ -144,12 +144,12 @@ class HistoryOrderAdapter(var stauts: String?, private val context: Context, var
return "退款完成"
}
else -> {
when (payType) {
when (orderPayType) {
1 -> {
return "無"
}
else -> {
when (orderPayType) {
when (payType) {
PayTypeContract.PAY_METHOD_ID_1021 -> { //Google pay需要5-7天
return "退款中(預計5-7個工作日退回原賬戶)"
}
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/HistoryFragment.kt
......@@ -49,9 +49,9 @@ class HistoryFragment : BaseFragment(R.layout.fragment_other_order) {
context?.let { context ->
var reasonDesc = it.reasonDesc
if (reasonDesc == null) {
reasonDesc = "";
reasonDesc = ""
}
OtherOrderUtils.showOrderDetailsDialog(context, it2, it.orderStatus, it.orderType,it.payType, it.status, reasonDesc, true) { _, _, _ ->
OtherOrderUtils.showOrderDetailsDialog(context, it2, it.orderStatus, it.orderType,it.orderPayType,it.payType, it.status, reasonDesc, true) { _, _, _ ->
//重印
showLoading()
viewModel.printOrder(context, it) {
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/util/OtherOrderUtils.kt
......@@ -31,7 +31,7 @@ import java.lang.Double.parseDouble
object OtherOrderUtils {
fun showOrderDetailsDialog(context: Context, data: OrderDetails, orderStuats: Int, orderType: Int, payType: Int, refundStatus: Int, reasonDesc: String = "", isHistory: Boolean = false, listenter: ((view: View, data: OrderDetails.DataBean, dialog: Dialog) -> Unit)?) {
fun showOrderDetailsDialog(context: Context, data: OrderDetails, orderStuats: Int, orderType: Int,orderPayType :Int, payType: Int, refundStatus: Int, reasonDesc: String = "", 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) {
......@@ -117,7 +117,7 @@ object OtherOrderUtils {
6 -> {
//已取消訂單
ivOrderState.setImageResource(R.drawable.img_cancelled)
setOrderReason(hepler, orderStuats, refundStatus, orderType,payType, reasonDesc)
setOrderReason(hepler, orderStuats, refundStatus, orderPayType,payType, reasonDesc)
}
}
// val payName = StringBuffer()
......@@ -257,12 +257,12 @@ object OtherOrderUtils {
return "退款完成"
}
else -> {
when (payType) {
when (orderPayType) {
1 -> {
return "無"
}
else -> {
when (orderPayType) {
when (payType) {
PayTypeContract.PAY_METHOD_ID_1021 -> { //Google pay需要5-7天
return "退款中(預計5-7個工作日退回原賬戶)"
}
......
component-download/src/main/java/com/gingersoft/gsa/cloud/download/mvp/ui/activity/DownloadActivity.java
......@@ -85,6 +85,12 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTransparent(this);
}
@Override
public int initView(@Nullable Bundle savedInstanceState) {
return R.layout.download_data_activity_download; //如果你不需要框架帮你设置 setContentView(id) 需要自行设置,请返回 0
}
......
component-login/hs_err_pid4944.log 0 → 100644
#
# A fatal error has been detected by the Java Runtime Environment:
#
# EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x0000000072a646b9, pid=4944, tid=0x00000000000049cc
#
# JRE version: OpenJDK Runtime Environment (8.0_242-b01) (build 1.8.0_242-release-1644-b01)
# Java VM: OpenJDK 64-Bit Server VM (25.242-b01 mixed mode windows-amd64 compressed oops)
# Problematic frame:
# V [jvm.dll+0x4346b9]
#
# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
#
# If you would like to submit a bug report, please visit:
#
#
--------------- T H R E A D ---------------
Current thread (0x0000000018590800): JavaThread "C2 CompilerThread0" daemon [_thread_in_native, id=18892, stack(0x0000000018dc0000,0x0000000018ec0000)]
siginfo: ExceptionCode=0xc0000005, reading address 0x0000000000000010
Registers:
RAX=0x00000000000004fa, RBX=0x0000000000000000, RCX=0x00000000226151a8, RDX=0x00000000258ef030
RSP=0x0000000018ebdb10, RBP=0x0000000000000010, RSI=0x0000000018ebde80, RDI=0x0000000018ebde80
R8 =0x0000000000000002, R9 =0x00000000185f6c10, R10=0x00000000185f6ba0, R11=0x00000000185f6c10
R12=0x000000002e195ba0, R13=0x0000000000000002, R14=0x000000002e195d00, R15=0x000000002e196b00
RIP=0x0000000072a646b9, EFLAGS=0x0000000000010246
Top of Stack: (sp=0x0000000018ebdb10)
0x0000000018ebdb10: 0000000000000008 00000000185f6c10
0x0000000018ebdb20: 0000000018ebde80 000000002e196ba0
0x0000000018ebdb30: 000000002e196ba0 000000002e195ba0
0x0000000018ebdb40: 0000000018ebde80 0000000018ebdc30
0x0000000018ebdb50: 0000000018ebe8e0 000000002e19b278
0x0000000018ebdb60: 0000000000000785 0000000072b1190b
0x0000000018ebdb70: 00000000185f6c10 0000000018ebde80
0x0000000018ebdb80: 000000002e195d00 0000000000000000
0x0000000018ebdb90: 000000001dcdea10 0000000072a917fa
0x0000000018ebdba0: 0000000018ebdc30 000000002e19b278
0x0000000018ebdbb0: 0000000000000003 000000000000001f
0x0000000018ebdbc0: 0000000000000000 0000000018ebe8e0
0x0000000018ebdbd0: 0000000000000001 0000000018ebe8e0
0x0000000018ebdbe0: 0000000018ebdda0 0000000072b00b65
0x0000000018ebdbf0: 0000000000000000 0000000018590800
0x0000000018ebdc00: 000000002e19b278 000000002856e201
Instructions: (pc=0x0000000072a646b9)
0x0000000072a64699: 48 8b 05 00 d0 39 00 48 39 04 ca 0f 85 b0 00 00
0x0000000072a646a9: 00 49 8b 46 08 48 8b 0c 28 8b 41 28 48 8b 1c c2
0x0000000072a646b9: 8b 43 10 83 f8 06 75 06 48 8b 43 18 eb 1c 83 f8
0x0000000072a646c9: 07 75 06 48 8b 43 18 eb 11 83 f8 0e 7c 0a 83 f8
Register to memory mapping:
RAX=0x00000000000004fa is an unknown value
RBX=0x0000000000000000 is an unknown value
RCX=0x00000000226151a8 is an unknown value
RDX=0x00000000258ef030 is an unknown value
RSP=0x0000000018ebdb10 is pointing into the stack for thread: 0x0000000018590800
RBP=0x0000000000000010 is an unknown value
RSI=0x0000000018ebde80 is pointing into the stack for thread: 0x0000000018590800
RDI=0x0000000018ebde80 is pointing into the stack for thread: 0x0000000018590800
R8 =0x0000000000000002 is an unknown value
R9 =0x00000000185f6c10 is an unknown value
R10=0x00000000185f6ba0 is an unknown value
R11=0x00000000185f6c10 is an unknown value
R12=0x000000002e195ba0 is an unknown value
R13=0x0000000000000002 is an unknown value
R14=0x000000002e195d00 is an unknown value
R15=0x000000002e196b00 is an unknown value
Stack: [0x0000000018dc0000,0x0000000018ec0000], sp=0x0000000018ebdb10, free space=1014k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
V [jvm.dll+0x4346b9]
V [jvm.dll+0x4e190b]
V [jvm.dll+0x4617fa]
V [jvm.dll+0x4d0b65]
V [jvm.dll+0x447d9b]
V [jvm.dll+0x42b072]
V [jvm.dll+0x8230f]
V [jvm.dll+0x82c7f]
V [jvm.dll+0x220b7f]
V [jvm.dll+0x27276a]
C [msvcr100.dll+0x21d9f]
C [msvcr100.dll+0x21e3b]
C [KERNEL32.DLL+0x17c24]
C [ntdll.dll+0x6d4d1]
Current CompileTask:
C2: 875831 58483 4 dagger.shaded.auto.common.MoreTypes$IsTypeVisitor::visitDeclared (10 bytes)
--------------- P R O C E S S ---------------
Java Threads: ( => current thread )
0x00000000206e5800 JavaThread "RMI TCP Connection(14)-127.0.0.1" daemon [_thread_in_native, id=6408, stack(0x0000000039bb0000,0x0000000039cb0000)]
0x00000000206ec000 JavaThread "RMI RenewClean-[127.0.0.1:17112,org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface$ClientLoopbackSocketFactory@4408db22]" daemon [_thread_blocked, id=18472, stack(0x00000000394e0000,0x00000000395e0000)]
0x00000000206e7000 JavaThread "RMI TCP Connection(12)-127.0.0.1" daemon [_thread_in_native, id=19392, stack(0x00000000395e0000,0x00000000396e0000)]
0x00000000206e9000 JavaThread "stdout" [_thread_in_native, id=10752, stack(0x000000003a010000,0x000000003a110000)]
0x00000000206ea800 JavaThread "stderr" [_thread_in_native, id=19608, stack(0x0000000039f10000,0x000000003a010000)]
0x00000000225dc800 JavaThread "stdout" [_thread_in_native, id=10136, stack(0x0000000039e10000,0x0000000039f10000)]
0x00000000224f5800 JavaThread "stderr" [_thread_in_native, id=12464, stack(0x0000000039d10000,0x0000000039e10000)]
0x000000001c752000 JavaThread "stdout" [_thread_in_native, id=20196, stack(0x0000000039ab0000,0x0000000039bb0000)]
0x0000000027eef000 JavaThread "stderr" [_thread_in_native, id=3636, stack(0x00000000399b0000,0x0000000039ab0000)]
0x0000000027eea800 JavaThread "stdout" [_thread_in_native, id=1320, stack(0x00000000398b0000,0x00000000399b0000)]
0x000000001fe21800 JavaThread "stderr" [_thread_in_native, id=9868, stack(0x00000000397b0000,0x00000000398b0000)]
0x000000001fe26000 JavaThread "stdout" [_thread_in_native, id=15012, stack(0x00000000393e0000,0x00000000394e0000)]
0x000000001fe24800 JavaThread "stderr" [_thread_in_native, id=16928, stack(0x00000000392e0000,0x00000000393e0000)]
0x0000000028e52800 JavaThread "stdout" [_thread_in_native, id=972, stack(0x00000000391e0000,0x00000000392e0000)]
0x0000000028e52000 JavaThread "stderr" [_thread_in_native, id=17232, stack(0x0000000037690000,0x0000000037790000)]
0x0000000028e51000 JavaThread "stdout" [_thread_in_native, id=12544, stack(0x0000000032b50000,0x0000000032c50000)]
0x0000000028e53800 JavaThread "stderr" [_thread_in_native, id=19448, stack(0x0000000031440000,0x0000000031540000)]
0x0000000028e50800 JavaThread "stdout" [_thread_in_native, id=16156, stack(0x000000002fb50000,0x000000002fc50000)]
0x0000000028e49000 JavaThread "stderr" [_thread_in_native, id=16732, stack(0x000000002afc0000,0x000000002b0c0000)]
0x0000000028e4f800 JavaThread "pool-864-thread-1" [_thread_blocked, id=8224, stack(0x000000001b560000,0x000000001b660000)]
0x0000000028e4b000 JavaThread "WorkerExecutor Queue Thread 11" [_thread_in_vm, id=18736, stack(0x0000000029ec0000,0x0000000029fc0000)]
0x000000001a05b000 JavaThread "RMI TCP Connection(15)-127.0.0.1" daemon [_thread_in_native, id=17788, stack(0x0000000031340000,0x0000000031440000)]
0x000000001a059800 JavaThread "RMI TCP Connection(13)-127.0.0.1" daemon [_thread_in_native, id=7032, stack(0x0000000030050000,0x0000000030150000)]
0x000000001c75a000 JavaThread "MarlinRenderer Disposer" daemon [_thread_blocked, id=11688, stack(0x000000002f7e0000,0x000000002f8e0000)]
0x000000001c754000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=9244, stack(0x000000002f6e0000,0x000000002f7e0000)]
0x000000001c757000 JavaThread "WorkerExecutor Queue Thread 9" [_thread_blocked, id=19500, stack(0x000000002f5e0000,0x000000002f6e0000)]
0x0000000027ef7000 JavaThread "WorkerExecutor Queue Thread 8" [_thread_blocked, id=252, stack(0x000000002ed50000,0x000000002ee50000)]
0x0000000027ef3800 JavaThread "WorkerExecutor Queue Thread 7" [_thread_blocked, id=19660, stack(0x000000002ec50000,0x000000002ed50000)]
0x0000000027ef4000 JavaThread "WorkerExecutor Queue Thread 6" [_thread_blocked, id=13016, stack(0x000000002d4a0000,0x000000002d5a0000)]
0x0000000027eeb000 JavaThread "Cache worker for Java compile cache (D:\Android\workspace\GSA-Cloud2\.gradle\5.4.1\javaCompile)" [_thread_blocked, id=20152, stack(0x000000002c300000,0x000000002c400000)]
0x0000000027eee000 JavaThread "WorkerExecutor Queue Thread 5" [_thread_blocked, id=19776, stack(0x000000002c200000,0x000000002c300000)]
0x000000001fe22000 JavaThread "WorkerExecutor Queue Thread 3" [_thread_blocked, id=7308, stack(0x000000002a4c0000,0x000000002a5c0000)]
0x000000001fe25000 JavaThread "WorkerExecutor Queue Thread 2" [_thread_blocked, id=13264, stack(0x000000002a2c0000,0x000000002a3c0000)]
0x000000001fe1a000 JavaThread "Cache worker for execution history cache (D:\Android\workspace\GSA-Cloud2\.gradle\5.4.1\executionHistory)" [_thread_blocked, id=8508, stack(0x0000000029ac0000,0x0000000029bc0000)]
0x000000001fe20800 JavaThread "Execution worker for ':' Thread 7" [_thread_in_native, id=6788, stack(0x00000000299c0000,0x0000000029ac0000)]
0x000000001fe19000 JavaThread "Execution worker for ':' Thread 6" [_thread_blocked, id=19564, stack(0x00000000298c0000,0x00000000299c0000)]
0x000000001fe1f000 JavaThread "Execution worker for ':' Thread 5" [_thread_blocked, id=12620, stack(0x00000000297c0000,0x00000000298c0000)]
0x000000001fe1b800 JavaThread "Execution worker for ':' Thread 4" [_thread_blocked, id=8468, stack(0x00000000272a0000,0x00000000273a0000)]
0x000000001fe1c000 JavaThread "Execution worker for ':' Thread 3" [_thread_blocked, id=20140, stack(0x0000000026b80000,0x0000000026c80000)]
0x000000001fe17800 JavaThread "Execution worker for ':' Thread 2" [_thread_blocked, id=18048, stack(0x0000000024aa0000,0x0000000024ba0000)]
0x00000000251a8800 JavaThread "Execution worker for ':'" [_thread_blocked, id=15364, stack(0x0000000024330000,0x0000000024430000)]
0x00000000251a7000 JavaThread "Cache worker for file content cache (D:\Android\workspace\GSA-Cloud2\.gradle\5.4.1\fileContent)" [_thread_blocked, id=9544, stack(0x0000000023630000,0x0000000023730000)]
0x00000000251ac000 JavaThread "Cache worker for Build Output Cleanup Cache (D:\Android\workspace\GSA-Cloud2\.gradle\buildOutputCleanup)" [_thread_blocked, id=15892, stack(0x0000000022e30000,0x0000000022f30000)]
0x00000000251a4800 JavaThread "Build operations Thread 8" [_thread_blocked, id=11452, stack(0x0000000021d60000,0x0000000021e60000)]
0x00000000251a9000 JavaThread "Build operations Thread 7" [_thread_blocked, id=20296, stack(0x0000000021c60000,0x0000000021d60000)]
0x000000002519d000 JavaThread "Build operations Thread 6" [_thread_blocked, id=13952, stack(0x00000000218b0000,0x00000000219b0000)]
0x00000000251a2000 JavaThread "Build operations Thread 5" [_thread_blocked, id=13060, stack(0x00000000217b0000,0x00000000218b0000)]
0x00000000251a0000 JavaThread "Build operations Thread 4" [_thread_blocked, id=9592, stack(0x00000000216b0000,0x00000000217b0000)]
0x00000000251a0800 JavaThread "Build operations Thread 3" [_thread_blocked, id=17900, stack(0x0000000021160000,0x0000000021260000)]
0x000000002519e800 JavaThread "Build operations Thread 2" [_thread_blocked, id=5004, stack(0x0000000020d60000,0x0000000020e60000)]
0x000000002519f000 JavaThread "Build operations" [_thread_blocked, id=1176, stack(0x000000001f5a0000,0x000000001f6a0000)]
0x00000000251a3000 JavaThread "Cache worker for cache directory md-rule (D:\gradle\caches\5.4.1\md-rule)" [_thread_blocked, id=20284, stack(0x000000001e200000,0x000000001e300000)]
0x00000000251a3800 JavaThread "Cache worker for cache directory md-supplier (D:\gradle\caches\5.4.1\md-supplier)" [_thread_blocked, id=4868, stack(0x000000001cf30000,0x000000001d030000)]
0x00000000224f9000 JavaThread "Cache worker for file hash cache (D:\Android\workspace\GSA-Cloud2\.gradle\5.4.1\fileHashes)" [_thread_blocked, id=19848, stack(0x000000001b960000,0x000000001ba60000)]
0x00000000224f8800 JavaThread "Thread-104" [_thread_blocked, id=8536, stack(0x000000001b660000,0x000000001b760000)]
0x00000000224ee000 JavaThread "Asynchronous log dispatcher for DefaultDaemonConnection: socket connection from /127.0.0.1:58939 to /127.0.0.1:59158" [_thread_blocked, id=12700, stack(0x000000001b260000,0x000000001b360000)]
0x00000000224f3000 JavaThread "Daemon worker Thread 3" [_thread_blocked, id=10476, stack(0x000000001b160000,0x000000001b260000)]
0x00000000224ea000 JavaThread "Cancel handler" [_thread_blocked, id=12048, stack(0x0000000002670000,0x0000000002770000)]
0x00000000224eb800 JavaThread "Handler for socket connection from /127.0.0.1:58939 to /127.0.0.1:59158" [_thread_in_native, id=2560, stack(0x00000000009d0000,0x0000000000ad0000)]
0x00000000224f1000 JavaThread "Daemon Thread 3" [_thread_blocked, id=20264, stack(0x00000000007d0000,0x00000000008d0000)]
0x00000000224f7800 JavaThread "Cache worker for Java compile cache (D:\gradle\caches\5.4.1\javaCompile)" [_thread_blocked, id=10600, stack(0x000000002a3c0000,0x000000002a4c0000)]
0x00000000224f7000 JavaThread "RMI Reaper" [_thread_blocked, id=10020, stack(0x000000002a1c0000,0x000000002a2c0000)]
0x00000000224f2800 JavaThread "RMI TCP Accept-0" daemon [_thread_in_native, id=20288, stack(0x000000002a0c0000,0x000000002a1c0000)]
0x00000000224f1800 JavaThread "GC Daemon" daemon [_thread_blocked, id=2956, stack(0x0000000029fc0000,0x000000002a0c0000)]
0x00000000224f4000 JavaThread "RMI Scheduler(0)" daemon [_thread_blocked, id=11148, stack(0x0000000029dc0000,0x0000000029ec0000)]
0x000000001c755000 JavaThread "Cache worker for file content cache (D:\gradle\caches\5.4.1\fileContent)" [_thread_blocked, id=1784, stack(0x0000000022f30000,0x0000000023030000)]
0x000000001fe1a800 JavaThread "Memory manager" [_thread_blocked, id=13284, stack(0x0000000024130000,0x0000000024230000)]
0x000000001c751000 JavaThread "Cache worker for execution history cache (D:\gradle\caches\5.4.1\executionHistory)" [_thread_blocked, id=16648, stack(0x0000000020e60000,0x0000000020f60000)]
0x000000001a05d000 JavaThread "Cache worker for journal cache (D:\gradle\caches\journal-1)" [_thread_blocked, id=7584, stack(0x000000001be60000,0x000000001bf60000)]
0x000000001a05a000 JavaThread "File lock request listener" [_thread_in_native, id=15524, stack(0x000000001bd60000,0x000000001be60000)]
0x000000001a058800 JavaThread "Cache worker for file hash cache (D:\gradle\caches\5.4.1\fileHashes)" [_thread_blocked, id=19172, stack(0x000000001ba60000,0x000000001bb60000)]
0x0000000019d27800 JavaThread "Daemon periodic checks" [_thread_blocked, id=9304, stack(0x000000001b060000,0x000000001b160000)]
0x00000000188f0000 JavaThread "Incoming local TCP Connector on port 58939" [_thread_in_native, id=20344, stack(0x000000001aeb0000,0x000000001afb0000)]
0x000000001a479800 JavaThread "Daemon health stats" [_thread_blocked, id=7288, stack(0x000000001ab90000,0x000000001ac90000)]
0x0000000018649800 JavaThread "Service Thread" daemon [_thread_blocked, id=20348, stack(0x00000000191c0000,0x00000000192c0000)]
0x00000000185eb000 JavaThread "C1 CompilerThread3" daemon [_thread_blocked, id=14216, stack(0x00000000190c0000,0x00000000191c0000)]
0x000000001676b000 JavaThread "C2 CompilerThread2" daemon [_thread_in_native, id=11356, stack(0x0000000018fc0000,0x00000000190c0000)]
0x000000001676a000 JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=17808, stack(0x0000000018ec0000,0x0000000018fc0000)]
=>0x0000000018590800 JavaThread "C2 CompilerThread0" daemon [_thread_in_native, id=18892, stack(0x0000000018dc0000,0x0000000018ec0000)]
0x00000000185e8000 JavaThread "Attach Listener" daemon [_thread_blocked, id=9476, stack(0x0000000018cc0000,0x0000000018dc0000)]
0x00000000185e7000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=11824, stack(0x0000000018bc0000,0x0000000018cc0000)]
0x000000000299d800 JavaThread "Finalizer" daemon [_thread_blocked, id=17264, stack(0x0000000018a50000,0x0000000018b50000)]
0x0000000018570800 JavaThread "Reference Handler" daemon [_thread_blocked, id=5160, stack(0x0000000018950000,0x0000000018a50000)]
0x000000000279d800 JavaThread "main" [_thread_blocked, id=18720, stack(0x00000000027a0000,0x00000000028a0000)]
Other Threads:
0x0000000016759000 VMThread [stack: 0x0000000018450000,0x0000000018550000] [id=12752]
0x000000001865b800 WatcherThread [stack: 0x00000000192c0000,0x00000000193c0000] [id=15296]
VM state:not at safepoint (normal execution)
VM Mutex/Monitor currently owned by a thread: None
heap address: 0x00000000a0000000, size: 1536 MB, Compressed Oops mode: 32-bit
Narrow klass base: 0x0000000000000000, Narrow klass shift: 3
Compressed class space size: 1073741824 Address: 0x0000000100000000
Heap:
PSYoungGen total 346624K, used 250089K [0x00000000e0000000, 0x00000000ffa00000, 0x0000000100000000)
eden space 209408K, 59% used [0x00000000e0000000,0x00000000e78fc238,0x00000000ecc80000)
from space 137216K, 91% used [0x00000000ecc80000,0x00000000f47be2d0,0x00000000f5280000)
to space 153088K, 0% used [0x00000000f6480000,0x00000000f6480000,0x00000000ffa00000)
ParOldGen total 973312K, used 746214K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd8b9a38,0x00000000db680000)
Metaspace used 195303K, capacity 208184K, committed 208512K, reserved 1230848K
class space used 24582K, capacity 27704K, committed 27776K, reserved 1048576K
Card table byte_map: [0x0000000011d60000,0x0000000012070000] byte_map_base: 0x0000000011860000
Marking Bits: (ParMarkBitMap*) 0x0000000072dff030
Begin Bits: [0x0000000012a70000, 0x0000000014270000)
End Bits: [0x0000000014270000, 0x0000000015a70000)
Polling page: 0x00000000003f0000
CodeCache: size=245760Kb used=150501Kb max_used=150507Kb free=95258Kb
bounds [0x00000000029a0000, 0x000000000bd70000, 0x00000000119a0000]
total_blobs=38223 nmethods=37135 adapters=994
compilation: enabled
Compilation events (10 events):
Event: 875.752 Thread 0x00000000185eb000 nmethod 58482 0x000000000bd5a450 code [0x000000000bd5a600, 0x000000000bd5aa08]
Event: 875.752 Thread 0x00000000185eb000 58484 3 com.google.common.collect.LinkedHashMultimap$ValueSet::setSuccessorInValueSet (6 bytes)
Event: 875.753 Thread 0x00000000185eb000 nmethod 58484 0x000000000bd53110 code [0x000000000bd53260, 0x000000000bd533d0]
Event: 875.756 Thread 0x000000001676b000 nmethod 58478 0x000000000bd584d0 code [0x000000000bd58660, 0x000000000bd589c8]
Event: 875.757 Thread 0x00000000185eb000 58485 3 dagger.model.AutoValue_DependencyRequest::equals (80 bytes)
Event: 875.759 Thread 0x00000000185eb000 nmethod 58485 0x000000000bd59090 code [0x000000000bd592a0, 0x000000000bd5a0f8]
Event: 875.760 Thread 0x000000001676b000 58486 4 dagger.shaded.auto.common.MoreElements::getAnnotationMirror (83 bytes)
Event: 875.762 Thread 0x000000001676a000 nmethod 58481 0x000000000bd5e710 code [0x000000000bd5e8a0, 0x000000000bd5ebd8]
Event: 875.762 Thread 0x000000001676a000 58487 ! 4 dagger.shaded.auto.common.MoreTypes$IsTypeOf::visitDeclared (64 bytes)
Event: 875.763 Thread 0x00000000185eb000 58488 1 dagger.model.AutoValue_DependencyRequest::requestElement (5 bytes)
GC Heap History (10 events):
Event: 856.585 GC heap before
{Heap before GC invocations=344 (full 72):
PSYoungGen total 322048K, used 298355K [0x00000000e0000000, 0x00000000f9c80000, 0x0000000100000000)
eden space 232448K, 100% used [0x00000000e0000000,0x00000000ee300000,0x00000000ee300000)
from space 89600K, 73% used [0x00000000f3e00000,0x00000000f7e5ce50,0x00000000f9580000)
to space 93184K, 0% used [0x00000000ee300000,0x00000000ee300000,0x00000000f3e00000)
ParOldGen total 973312K, used 730368K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 75% used [0x00000000a0000000,0x00000000cc940168,0x00000000db680000)
Metaspace used 185402K, capacity 197752K, committed 198144K, reserved 1220608K
class space used 23215K, capacity 26267K, committed 26368K, reserved 1048576K
Event: 856.661 GC heap after
Heap after GC invocations=344 (full 72):
PSYoungGen total 325632K, used 76758K [0x00000000e0000000, 0x00000000fa800000, 0x0000000100000000)
eden space 232448K, 0% used [0x00000000e0000000,0x00000000e0000000,0x00000000ee300000)
from space 93184K, 82% used [0x00000000ee300000,0x00000000f2df5ab8,0x00000000f3e00000)
to space 99840K, 0% used [0x00000000f4680000,0x00000000f4680000,0x00000000fa800000)
ParOldGen total 973312K, used 730392K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 75% used [0x00000000a0000000,0x00000000cc946168,0x00000000db680000)
Metaspace used 185402K, capacity 197752K, committed 198144K, reserved 1220608K
class space used 23215K, capacity 26267K, committed 26368K, reserved 1048576K
}
Event: 860.069 GC heap before
{Heap before GC invocations=345 (full 72):
PSYoungGen total 325632K, used 309206K [0x00000000e0000000, 0x00000000fa800000, 0x0000000100000000)
eden space 232448K, 100% used [0x00000000e0000000,0x00000000ee300000,0x00000000ee300000)
from space 93184K, 82% used [0x00000000ee300000,0x00000000f2df5ab8,0x00000000f3e00000)
to space 99840K, 0% used [0x00000000f4680000,0x00000000f4680000,0x00000000fa800000)
ParOldGen total 973312K, used 730392K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 75% used [0x00000000a0000000,0x00000000cc946168,0x00000000db680000)
Metaspace used 185482K, capacity 197880K, committed 198144K, reserved 1220608K
class space used 23224K, capacity 26267K, committed 26368K, reserved 1048576K
Event: 860.317 GC heap after
Heap after GC invocations=345 (full 72):
PSYoungGen total 314880K, used 99829K [0x00000000e0000000, 0x00000000fcf00000, 0x0000000100000000)
eden space 215040K, 0% used [0x00000000e0000000,0x00000000e0000000,0x00000000ed200000)
from space 99840K, 99% used [0x00000000f4680000,0x00000000fa7fd648,0x00000000fa800000)
to space 119296K, 0% used [0x00000000ed200000,0x00000000ed200000,0x00000000f4680000)
ParOldGen total 973312K, used 744587K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd722d20,0x00000000db680000)
Metaspace used 185482K, capacity 197880K, committed 198144K, reserved 1220608K
class space used 23224K, capacity 26267K, committed 26368K, reserved 1048576K
}
Event: 863.344 GC heap before
{Heap before GC invocations=346 (full 72):
PSYoungGen total 314880K, used 314869K [0x00000000e0000000, 0x00000000fcf00000, 0x0000000100000000)
eden space 215040K, 100% used [0x00000000e0000000,0x00000000ed200000,0x00000000ed200000)
from space 99840K, 99% used [0x00000000f4680000,0x00000000fa7fd648,0x00000000fa800000)
to space 119296K, 0% used [0x00000000ed200000,0x00000000ed200000,0x00000000f4680000)
ParOldGen total 973312K, used 744587K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd722d20,0x00000000db680000)
Metaspace used 185566K, capacity 197952K, committed 198144K, reserved 1220608K
class space used 23230K, capacity 26267K, committed 26368K, reserved 1048576K
Event: 863.445 GC heap after
Heap after GC invocations=346 (full 72):
PSYoungGen total 334336K, used 98967K [0x00000000e0000000, 0x00000000fd080000, 0x0000000100000000)
eden space 215040K, 0% used [0x00000000e0000000,0x00000000e0000000,0x00000000ed200000)
from space 119296K, 82% used [0x00000000ed200000,0x00000000f32a5c38,0x00000000f4680000)
to space 129024K, 0% used [0x00000000f5280000,0x00000000f5280000,0x00000000fd080000)
ParOldGen total 973312K, used 745838K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd85ba38,0x00000000db680000)
Metaspace used 185566K, capacity 197952K, committed 198144K, reserved 1220608K
class space used 23230K, capacity 26267K, committed 26368K, reserved 1048576K
}
Event: 868.672 GC heap before
{Heap before GC invocations=347 (full 72):
PSYoungGen total 334336K, used 314007K [0x00000000e0000000, 0x00000000fd080000, 0x0000000100000000)
eden space 215040K, 100% used [0x00000000e0000000,0x00000000ed200000,0x00000000ed200000)
from space 119296K, 82% used [0x00000000ed200000,0x00000000f32a5c38,0x00000000f4680000)
to space 129024K, 0% used [0x00000000f5280000,0x00000000f5280000,0x00000000fd080000)
ParOldGen total 973312K, used 745838K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd85ba38,0x00000000db680000)
Metaspace used 185738K, capacity 198248K, committed 198400K, reserved 1220608K
class space used 23270K, capacity 26292K, committed 26368K, reserved 1048576K
Event: 868.817 GC heap after
Heap after GC invocations=347 (full 72):
PSYoungGen total 338432K, used 100179K [0x00000000e0000000, 0x00000000fe080000, 0x0000000100000000)
eden space 209408K, 0% used [0x00000000e0000000,0x00000000e0000000,0x00000000ecc80000)
from space 129024K, 77% used [0x00000000f5280000,0x00000000fb454c60,0x00000000fd080000)
to space 137216K, 0% used [0x00000000ecc80000,0x00000000ecc80000,0x00000000f5280000)
ParOldGen total 973312K, used 745846K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd85da38,0x00000000db680000)
Metaspace used 185738K, capacity 198248K, committed 198400K, reserved 1220608K
class space used 23270K, capacity 26292K, committed 26368K, reserved 1048576K
}
Event: 871.439 GC heap before
{Heap before GC invocations=348 (full 72):
PSYoungGen total 338432K, used 309587K [0x00000000e0000000, 0x00000000fe080000, 0x0000000100000000)
eden space 209408K, 100% used [0x00000000e0000000,0x00000000ecc80000,0x00000000ecc80000)
from space 129024K, 77% used [0x00000000f5280000,0x00000000fb454c60,0x00000000fd080000)
to space 137216K, 0% used [0x00000000ecc80000,0x00000000ecc80000,0x00000000f5280000)
ParOldGen total 973312K, used 745846K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd85da38,0x00000000db680000)
Metaspace used 186160K, capacity 198680K, committed 198912K, reserved 1222656K
class space used 23307K, capacity 26332K, committed 26368K, reserved 1048576K
Event: 871.568 GC heap after
Heap after GC invocations=348 (full 72):
PSYoungGen total 346624K, used 126200K [0x00000000e0000000, 0x00000000ffa00000, 0x0000000100000000)
eden space 209408K, 0% used [0x00000000e0000000,0x00000000e0000000,0x00000000ecc80000)
from space 137216K, 91% used [0x00000000ecc80000,0x00000000f47be2d0,0x00000000f5280000)
to space 153088K, 0% used [0x00000000f6480000,0x00000000f6480000,0x00000000ffa00000)
ParOldGen total 973312K, used 746214K [0x00000000a0000000, 0x00000000db680000, 0x00000000e0000000)
object space 973312K, 76% used [0x00000000a0000000,0x00000000cd8b9a38,0x00000000db680000)
Metaspace used 186160K, capacity 198680K, committed 198912K, reserved 1222656K
class space used 23307K, capacity 26332K, committed 26368K, reserved 1048576K
}
Deoptimization events (10 events):
Event: 875.197 Thread 0x0000000028e4b000 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x000000000b988240 method=com.google.common.collect.AbstractIndexedListIterator.next()Ljava/lang/Object; @ 27
Event: 875.300 Thread 0x0000000028e4b000 Uncommon trap: reason=speculate_class_check action=maybe_recompile pc=0x000000000bcb9f68 method=com.google.common.collect.Range.<init>(Lcom/google/common/collect/Cut;Lcom/google/common/collect/Cut;)V @ 28
Event: 875.343 Thread 0x0000000028e4b000 Uncommon trap: reason=speculate_class_check action=maybe_recompile pc=0x000000000bcb9f68 method=com.google.common.collect.Range.<init>(Lcom/google/common/collect/Cut;Lcom/google/common/collect/Cut;)V @ 28
Event: 875.395 Thread 0x0000000028e4b000 Uncommon trap: reason=speculate_class_check action=maybe_recompile pc=0x000000000bcb9f68 method=com.google.common.collect.Range.<init>(Lcom/google/common/collect/Cut;Lcom/google/common/collect/Cut;)V @ 28
Event: 875.404 Thread 0x0000000028e4b000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000bcbb55c method=com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.refreshIfEmpty()V @ 40
Event: 875.405 Thread 0x0000000028e4b000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000bcbb55c method=com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.refreshIfEmpty()V @ 40
Event: 875.425 Thread 0x0000000028e4b000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000bcbb55c method=com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.refreshIfEmpty()V @ 40
Event: 875.425 Thread 0x0000000028e4b000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000bcbb55c method=com.google.common.collect.AbstractMapBasedMultimap$WrappedCollection.refreshIfEmpty()V @ 40
Event: 875.719 Thread 0x0000000028e4b000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000bce2554 method=java.util.Spliterators$IteratorSpliterator.forEachRemaining(Ljava/util/function/Consumer;)V @ 26
Event: 875.748 Thread 0x0000000028e4b000 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000bce2554 method=java.util.Spliterators$IteratorSpliterator.forEachRemaining(Ljava/util/function/Consumer;)V @ 26
Classes redefined (0 events):
No events
Internal exceptions (10 events):
Event: 863.673 Thread 0x000000001fe1f000 Exception <a 'java/security/PrivilegedActionException'> (0x00000000e1187350) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\prims\jvm.cpp, line 1502]
Event: 863.674 Thread 0x000000001fe1f000 Exception <a 'java/security/PrivilegedActionException'> (0x00000000e11966f0) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\prims\jvm.cpp, line 1502]
Event: 863.674 Thread 0x000000001fe1f000 Exception <a 'java/security/PrivilegedActionException'> (0x00000000e1197658) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\prims\jvm.cpp, line 1502]
Event: 863.675 Thread 0x000000001fe1f000 Exception <a 'java/security/PrivilegedActionException'> (0x00000000e11a4e68) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\prims\jvm.cpp, line 1502]
Event: 863.675 Thread 0x000000001fe1f000 Exception <a 'java/security/PrivilegedActionException'> (0x00000000e11a5dd0) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\prims\jvm.cpp, line 1502]
Event: 863.676 Thread 0x000000001fe1f000 Exception <a 'java/lang/ClassNotFoundException': groovy/xml/MarkupBuilder$ReplacingClosureCustomizer> (0x00000000e11c3e40) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\classfile\systemDictionary.cpp, line 210]
Event: 863.761 Thread 0x00000000224f3000 Exception <a 'sun/nio/fs/WindowsException'> (0x00000000e1cf9c88) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\prims\jni.cpp, line 710]
Event: 864.532 Thread 0x00000000206ec000 Exception <a 'java/lang/InterruptedException'> (0x00000000e6b5e198) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\runtime\objectMonitor.cpp, line 1680]
Event: 870.319 Thread 0x00000000206ec000 Exception <a 'java/lang/InterruptedException'> (0x00000000e7de2c28) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\runtime\objectMonitor.cpp, line 1680]
Event: 872.155 Thread 0x0000000028e4b000 Exception <a 'java/lang/IncompatibleClassChangeError': Found class java.lang.Object, but interface was expected> (0x00000000e2628dd8) thrown at [C:\src\AOSP-openjdk-git\hotspot\src\share\vm\interpreter\linkResolver.cpp, line 653]
Events (10 events):
Event: 875.591 loading class dagger/internal/codegen/ComponentDescriptor$ComponentMethodDescriptor
Event: 875.591 loading class dagger/internal/codegen/ComponentDescriptor$ComponentMethodDescriptor done
Event: 875.591 loading class dagger/internal/codegen/ComponentDescriptor$ComponentMethodDescriptor
Event: 875.591 loading class dagger/internal/codegen/ComponentDescriptor$ComponentMethodDescriptor done
Event: 875.719 Thread 0x0000000028e4b000 Uncommon trap: trap_request=0xffffffde fr.pc=0x000000000bce2554
Event: 875.719 Thread 0x0000000028e4b000 DEOPT PACKING pc=0x000000000bce2554 sp=0x0000000029fbd290
Event: 875.719 Thread 0x0000000028e4b000 DEOPT UNPACKING pc=0x00000000029e557b sp=0x0000000029fbd228 mode 2
Event: 875.748 Thread 0x0000000028e4b000 Uncommon trap: trap_request=0xffffffde fr.pc=0x000000000bce2554
Event: 875.748 Thread 0x0000000028e4b000 DEOPT PACKING pc=0x000000000bce2554 sp=0x0000000029fbd180
Event: 875.748 Thread 0x0000000028e4b000 DEOPT UNPACKING pc=0x00000000029e557b sp=0x0000000029fbd118 mode 2
Dynamic libraries:
0x00007ff7f50c0000 - 0x00007ff7f50f1000 D:\Android\AndroidStudio\jre\bin\java.exe
0x00007ffdef780000 - 0x00007ffdef970000 C:\Windows\SYSTEM32\ntdll.dll
0x00007ffded970000 - 0x00007ffdeda22000 C:\Windows\System32\KERNEL32.DLL
0x00007ffdec830000 - 0x00007ffdecad5000 C:\Windows\System32\KERNELBASE.dll
0x00007ffdedea0000 - 0x00007ffdedf43000 C:\Windows\System32\ADVAPI32.dll
0x00007ffdedc80000 - 0x00007ffdedd1e000 C:\Windows\System32\msvcrt.dll
0x00007ffdede00000 - 0x00007ffdede97000 C:\Windows\System32\sechost.dll
0x00007ffdedfd0000 - 0x00007ffdee0ef000 C:\Windows\System32\RPCRT4.dll
0x00007ffdeda30000 - 0x00007ffdedbc4000 C:\Windows\System32\USER32.dll
0x00007ffdec800000 - 0x00007ffdec821000 C:\Windows\System32\win32u.dll
0x00007ffdeddd0000 - 0x00007ffdeddf6000 C:\Windows\System32\GDI32.dll
0x00007ffded610000 - 0x00007ffded7a8000 C:\Windows\System32\gdi32full.dll
0x00007ffdecae0000 - 0x00007ffdecb7e000 C:\Windows\System32\msvcp_win.dll
0x00007ffdec700000 - 0x00007ffdec7fa000 C:\Windows\System32\ucrtbase.dll
0x00007ffdd2f00000 - 0x00007ffdd3184000 C:\Windows\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.18362.1316_none_9e7a364fe461dbd7\COMCTL32.dll
0x00007ffdee9c0000 - 0x00007ffdeecf7000 C:\Windows\System32\combase.dll
0x00007ffdecdb0000 - 0x00007ffdece31000 C:\Windows\System32\bcryptPrimitives.dll
0x00007ffdef5d0000 - 0x00007ffdef5fe000 C:\Windows\System32\IMM32.DLL
0x0000000072470000 - 0x0000000072542000 D:\Android\AndroidStudio\jre\jre\bin\msvcr100.dll
0x0000000072630000 - 0x0000000072e7b000 D:\Android\AndroidStudio\jre\jre\bin\server\jvm.dll
0x00007ffdee9b0000 - 0x00007ffdee9b8000 C:\Windows\System32\PSAPI.DLL
0x00007ffdd58c0000 - 0x00007ffdd58c9000 C:\Windows\SYSTEM32\WSOCK32.dll
0x00007ffdeed00000 - 0x00007ffdeed6f000 C:\Windows\System32\WS2_32.dll
0x00007ffde93b0000 - 0x00007ffde93d4000 C:\Windows\SYSTEM32\WINMM.dll
0x00007ffde3cc0000 - 0x00007ffde3cca000 C:\Windows\SYSTEM32\VERSION.dll
0x00007ffde9380000 - 0x00007ffde93ad000 C:\Windows\SYSTEM32\WINMMBASE.dll
0x00007ffdece40000 - 0x00007ffdece8a000 C:\Windows\System32\cfgmgr32.dll
0x00007ffde8a80000 - 0x00007ffde8a8f000 D:\Android\AndroidStudio\jre\jre\bin\verify.dll
0x00007ffde4420000 - 0x00007ffde4449000 D:\Android\AndroidStudio\jre\jre\bin\java.dll
0x00007ffde4540000 - 0x00007ffde4556000 D:\Android\AndroidStudio\jre\jre\bin\zip.dll
0x00007ffdee220000 - 0x00007ffdee908000 C:\Windows\System32\SHELL32.dll
0x00007ffdedbd0000 - 0x00007ffdedc77000 C:\Windows\System32\shcore.dll
0x00007ffdece90000 - 0x00007ffded60b000 C:\Windows\System32\windows.storage.dll
0x00007ffdec6b0000 - 0x00007ffdec6d3000 C:\Windows\System32\profapi.dll
0x00007ffdec640000 - 0x00007ffdec68a000 C:\Windows\System32\powrprof.dll
0x00007ffdec630000 - 0x00007ffdec640000 C:\Windows\System32\UMPDC.dll
0x00007ffdee950000 - 0x00007ffdee9a2000 C:\Windows\System32\shlwapi.dll
0x00007ffdec6e0000 - 0x00007ffdec6f1000 C:\Windows\System32\kernel.appcore.dll
0x00007ffded810000 - 0x00007ffded827000 C:\Windows\System32\cryptsp.dll
0x00007ffde4400000 - 0x00007ffde441a000 D:\Android\AndroidStudio\jre\jre\bin\net.dll
0x00007ffdebe30000 - 0x00007ffdebe97000 C:\Windows\system32\mswsock.dll
0x00007ffde43e0000 - 0x00007ffde43f3000 D:\Android\AndroidStudio\jre\jre\bin\nio.dll
0x00007ffddd600000 - 0x00007ffddd626000 D:\gradle\native\29\windows-amd64\native-platform.dll
0x00007ffde7170000 - 0x00007ffde717d000 D:\Android\AndroidStudio\jre\jre\bin\management.dll
0x00007ffdeb9b0000 - 0x00007ffdeb9e3000 C:\Windows\system32\rsaenh.dll
0x00007ffdeccd0000 - 0x00007ffdeccf6000 C:\Windows\System32\bcrypt.dll
0x00007ffdec510000 - 0x00007ffdec535000 C:\Windows\SYSTEM32\USERENV.dll
0x00007ffdebff0000 - 0x00007ffdebffc000 C:\Windows\SYSTEM32\CRYPTBASE.dll
0x00007ffdebb50000 - 0x00007ffdebb8a000 C:\Windows\SYSTEM32\IPHLPAPI.DLL
0x00007ffdee910000 - 0x00007ffdee918000 C:\Windows\System32\NSI.dll
0x00007ffddedd0000 - 0x00007ffddede6000 C:\Windows\SYSTEM32\dhcpcsvc6.DLL
0x00007ffddedb0000 - 0x00007ffddedcc000 C:\Windows\SYSTEM32\dhcpcsvc.DLL
0x00007ffdebbe0000 - 0x00007ffdebcab000 C:\Windows\SYSTEM32\DNSAPI.dll
0x00007ffde6ee0000 - 0x00007ffde6efe000 C:\Users\86186\AppData\Local\Temp\native-platform3020664768670392894dir\native-platform.dll
0x00007ffdeb630000 - 0x00007ffdeb661000 C:\Windows\SYSTEM32\ntmarta.dll
0x00007ffddb580000 - 0x00007ffddb71c000 D:\Android\AndroidStudio\jre\jre\bin\awt.dll
0x00007ffdef670000 - 0x00007ffdef735000 C:\Windows\System32\OLEAUT32.dll
0x00007ffdead60000 - 0x00007ffdead8d000 C:\Windows\SYSTEM32\dwmapi.dll
0x00007ffde94b0000 - 0x00007ffde9a70000 C:\Windows\SYSTEM32\d2d1.dll
0x00007ffdea890000 - 0x00007ffdea91f000 C:\Windows\SYSTEM32\apphelp.dll
0x00007ffdea940000 - 0x00007ffdea9d9000 C:\Windows\system32\uxtheme.dll
0x00007ffde8c70000 - 0x00007ffde8e64000 C:\Windows\SYSTEM32\dbghelp.dll
VM Arguments:
jvm_args: -Xmx1536m -Dfile.encoding=UTF-8 -Duser.country=CN -Duser.language=zh -Duser.variant
java_command: org.gradle.launcher.daemon.bootstrap.GradleDaemon 5.4.1
java_class_path (initial): D:\gradle\wrapper\dists\gradle-5.4.1-all\3221gyojl5jsh0helicew7rwx\gradle-5.4.1\lib\gradle-launcher-5.4.1.jar
Launcher Type: SUN_STANDARD
Environment Variables:
JAVA_HOME=D:\Android\AndroidStudio\jre
CLASSPATH=.;D:\Android\AndroidStudio\jre/lib/tools.jar;D:\Android\AndroidStudio\jre/lib/dt.jar
PATH=D:\Android\AndroidStudio\jre/bin;D:\Android\AndroidStudio\jre/jre/bin;C:\Program Files\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\Android\AndroidSDK\platform-tools;D:\Git\cmd;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Users\86186\AppData\Local\Microsoft\WindowsApps;
USERNAME=86186
OS=Windows_NT
PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 126 Stepping 5, GenuineIntel
--------------- S Y S T E M ---------------
OS: Windows 10.0 , 64 bit Build 18362 (10.0.18362.1316)
CPU:total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 126 stepping 5, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx
Memory: 4k page, physical 8084284k(1243240k free), swap 21180732k(8929312k free)
vm_info: OpenJDK 64-Bit Server VM (25.242-b01) for windows-amd64 JRE (1.8.0_242-release-1644-b01), built by "builder" with MS VC++ 10.0 (VS2010)
time: Thu Jan 28 14:54:46 2021
timezone: й׼ʱ
elapsed time: 875 seconds (0d 0h 14m 35s)
component-login/replay_pid4944.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/WelcomeActivity.java
......@@ -4,7 +4,6 @@ import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.content.Intent;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.text.TextUtils;
import android.view.View;
import android.view.animation.Animation;
......@@ -13,12 +12,10 @@ import android.view.animation.DecelerateInterpolator;
import android.view.animation.ScaleAnimation;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.viewpager2.widget.ViewPager2;
import com.gingersoft.gsa.cloud.common.core.login.LoginBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserConstans;
......
component-main/src/main/AndroidManifest.xml
......@@ -9,7 +9,8 @@
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.NewMainActivity"
android:launchMode="singleTop" />
android:launchMode="singleTop"
android:screenOrientation="portrait"/>
<activity
android:name=".mvp.ui.activity.ExpandListActivity"
android:screenOrientation="portrait" />
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -24,6 +24,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.constans.ResultConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
......@@ -36,6 +37,7 @@ import com.gingersoft.gsa.cloud.common.function.jump.ActivityJumpStrategy;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.utils.AppDevices;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.StytemUtils;
import com.gingersoft.gsa.cloud.common.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.common.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
......@@ -202,11 +204,14 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
} else {
tv_version_name.setText("v_" + DeviceUtils.getVersionName(this));
}
//開啟Prj打印服務
CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
.setActionName("openPrintService")
.build()
.call();
boolean prjServiceRunning = StytemUtils.isServiceRunning("com.joe.print.mvp.print.service.PrjService", this);
if (!prjServiceRunning) {
//開啟Prj打印服務
CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
.setActionName("openPrintService")
.build()
.call();
}
}
@Override
......@@ -230,16 +235,14 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_about_us, "關於我們"));
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_setting, "上傳日誌"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_settlement_report, "清機"));
if (AppDevices.isHywebPos()) {
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_settlement_report, "N5清機"));
}
if (BuildConfig.DEBUG) {
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "切換環境"));
}
MainSideMenuAdapter adapter = new MainSideMenuAdapter(mainSideMenuBeans);
mRvSideMenu.setAdapter(adapter);
adapter.setOnItemClickListener((adapter1, view, position) -> {
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/activity/TableManageActivity.java
......@@ -324,6 +324,7 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
}
}
public List<TableArea> getTableAreaList() {
return mTableAreaList;
}
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddAreaFragment.java
......@@ -230,9 +230,13 @@ public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements A
@Override
public void killMyself() {
_mActivity.onBackPressed();
_mActivity.onBackPressedSupport();
}
@Override
public boolean onBackPressedSupport() {
return super.onBackPressedSupport();
}
public AreaRequest.Add createAddAreaRequest() {
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
......@@ -425,7 +425,12 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
@Override
public void killMyself() {
_mActivity.onBackPressed();
_mActivity.onBackPressedSupport();
}
@Override
public boolean onBackPressedSupport() {
return super.onBackPressedSupport();
}
public TableRequest.Add createAddTableRequest() {
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AreaListFragment.java
......@@ -382,7 +382,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
@Override
public void killMyself() {
_mActivity.onBackPressed();
_mActivity.onBackPressedSupport();
}
private View.OnClickListener onRetryClickListener = new View.OnClickListener() {
......
component-print/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java
......@@ -2,6 +2,7 @@ package com.joe.print.mvp.print;
import android.content.Context;
import android.graphics.Bitmap;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -293,7 +294,7 @@ public class PrintPrjKitchen extends PrinterRoot {
if (!TextUtil.isEmptyOrNullOrUndefined(prjBean.getBillNo())) {
//訂單碼不為空
tvOrderNumberText.setText("訂單碼：");
tvOrderNumberText.setText("訂單碼:");
tvOrderNumber.setText(prjBean.getBillNo());
} else {
//訂單號
......@@ -326,12 +327,16 @@ public class PrintPrjKitchen extends PrinterRoot {
layoutOpenTableTime.setVisibility(View.GONE);
tvTableNumber.setText("外賣");
tvTableNumber2.setText("外賣");
tvOrderNumberText.setText("訂單碼：");
tvOrderNumberText.setText("訂單碼:");
tvOrderNumber.setText(prjBean.getTakeFoodCode());
break;
}
//操作人員名稱
tvWaiter.setText(prjBean.getUserName());
//操作人員名稱0
if (!TextUtils.isEmpty(prjBean.getUserName())) {
tvWaiter.setText(prjBean.getUserName());
} else {
tvWaiter.setText(prjBean.getMemberName());
}
// if (TextUtil.isEmptyOrNullOrUndefined(prjBean.getTableName())) {
// layoutOpenTableTime.setVisibility(View.GONE);
// switch (prjBean.getOrderType()) {
......@@ -372,9 +377,9 @@ public class PrintPrjKitchen extends PrinterRoot {
view.findViewById(R.id.tv_people).setVisibility(View.VISIBLE);
}
if (TextUtil.isNotEmptyOrNullOrUndefined(prjBean.getTakeTime())) {
tvTakeTime.setText("取餐時間：" + prjBean.getTakeTime());
tvTakeTime.setText("取餐:" + prjBean.getTakeTime());
} else if (TextUtil.isNotEmptyOrNullOrUndefined(prjBean.getSendTime())) {
tvTakeTime.setText("送達時間：" + prjBean.getSendTime());
tvTakeTime.setText("送達:" + prjBean.getSendTime());
} else {
tvTakeTime.setVisibility(View.GONE);
}
......
component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
......@@ -8,6 +8,7 @@ import android.graphics.Bitmap;
import android.os.Build;
import android.os.IBinder;
import android.os.RemoteException;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.Nullable;
......@@ -119,7 +120,7 @@ public class PrjService extends Service implements ReceiveListener {
public int onStartCommand(Intent intent, int flags, int startId) {
mContext = this;
ThreadPoolManager.getInstence().putExecutableTasks(() -> {
LoganManager.w_printer(TAG, "currentThreadName: "+Thread.currentThread().getName());
LoganManager.w_printer(TAG, "currentThreadName: " + Thread.currentThread().getName());
LoganManager.w_printer(TAG, "開始請求 PRJ 數據");
getPrintList();
//開始請求
......@@ -214,7 +215,7 @@ public class PrjService extends Service implements ReceiveListener {
@Override
public void onSubscribe(Disposable d) {
LoganManager.w_printer(TAG, "RxCurrentThreadName: "+Thread.currentThread().getName());
LoganManager.w_printer(TAG, "RxCurrentThreadName: " + Thread.currentThread().getName());
LoganManager.w_printer(TAG, "getPrjInfo onSubscribe");
}
......@@ -533,7 +534,7 @@ public class PrjService extends Service implements ReceiveListener {
if (beans.size() > 0) {
orderType = beans.get(0).getOrderType();
}
PrintPaperPlugins.getOnPrinterFlowHandler().onPrinterDataBefore(orderType,GsonUtils.GsonString(beans), GsonUtils.GsonString(printerDeviceBean));
PrintPaperPlugins.getOnPrinterFlowHandler().onPrinterDataBefore(orderType, GsonUtils.GsonString(beans), GsonUtils.GsonString(printerDeviceBean));
if (isPinPrinter(printerDeviceBean) && printerDeviceBean.getPrinterDeviceType() == PRINT_IP) {
//針式打印機並且打印機類型為IP打印，生成獨特的格式
......@@ -931,13 +932,20 @@ public class PrjService extends Service implements ReceiveListener {
}
if (bitmapMaps.size() > 0) {
String prjName = null;
String prjName = String.valueOf(System.currentTimeMillis());
int orderType = 1;
if (beans.size() > 0) {
prjName = beans.get(0).getBillNo().isEmpty() ? beans.get(0).getOrderNo() : beans.get(0).getBillNo();
orderType = beans.get(0).getOrderType();
PrjBean.DataBean.Bean prjBean = beans.get(0);
if (prjBean != null) {
if (!TextUtils.isEmpty(prjBean.getBillNo())) {
prjName = prjBean.getBillNo();
} else {
prjName = prjBean.getOrderNo();
}
orderType = prjBean.getOrderType();
}
}
PrintPaperPlugins.getOnPrinterFlowHandler().onPrinterBitmapBefore(orderType,prjName, bitmapMaps);
PrintPaperPlugins.getOnPrinterFlowHandler().onPrinterBitmapBefore(orderType, prjName, bitmapMaps);
}
return bitmapMaps;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
......@@ -168,7 +168,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
private void setBtnListener(OrderManagerResponse orderBean) {
if (orderBean.getStatus() != OrderStatusContract.STATUS_6) {
if (orderBean.isCurrDeviceOrder()) {
if (orderBean.getMatterStatus() == OrderManagerResponse.MATTER_STATUS_SUCCESS) {
cb_order.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
......@@ -226,16 +225,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
void onItemClick(OrderManagerResponse datasBean, int position);
// void onPrintClick(OrderManagerResponse datasBean, int position);
//
// void onModifyClick(OrderManagerResponse datasBean, int position);
//
// void onCancelClick(OrderManagerResponse datasBean, int position);
//
// void onRefundClick(OrderManagerResponse datasBean, int position);
//
// void onTipsClick(OrderManagerResponse datasBean, int position);
void onCheckedChanged(OrderManagerResponse checkedOrder);
void onReloadExceptionStatus(OrderManagerResponse datasBean, String txnId);
......
library-base/src/main/java/com/jess/arms/base/BaseActivity.java
......@@ -58,7 +58,7 @@ import static com.jess.arms.utils.ThirdViewUtil.convertAutoView;
* <a href="https://github.com/JessYanCoding">Follow me</a>
* ================================================
*/
public abstract class BaseActivity<P extends IPresenter> extends QMUIActivity implements IActivity, ActivityLifecycleable {
public abstract class BaseActivity<P extends IPresenter> extends AppCompatActivity implements IActivity, ActivityLifecycleable {
protected final String TAG = this.getClass().getSimpleName();
private final BehaviorSubject<ActivityEvent> mLifecycleSubject = BehaviorSubject.create();
private Cache<String, Object> mCache;
......
library-base/src/main/java/com/jess/arms/base/BaseFragment.java
......@@ -61,7 +61,7 @@ import me.yokeyword.fragmentation.anim.FragmentAnimator;
* <a href="https://github.com/JessYanCoding">Follow me</a>
* ================================================
*/
public abstract class BaseFragment<P extends IPresenter> extends QMUIFragment implements IFragment, ISupportFragment, FragmentLifecycleable {
public abstract class BaseFragment<P extends IPresenter> extends Fragment implements IFragment, ISupportFragment, FragmentLifecycleable {
protected final String TAG = this.getClass().getSimpleName();
private final BehaviorSubject<FragmentEvent> mLifecycleSubject = BehaviorSubject.create();
private Cache<String, Object> mCache;
......@@ -140,30 +140,32 @@ public abstract class BaseFragment<P extends IPresenter> extends QMUIFragment im
mDelegate.onActivityCreated(savedInstanceState);
}
@Override
protected View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container) {
mCacheRootView = initView(inflater, container, null);
return mCacheRootView;
}
// @Nullable
// @Override
// public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
// if (view != null) {
// ViewGroup viewGroup = (ViewGroup) view.getRootView();
// if (viewGroup != null) {
// viewGroup.removeView(view);
// }
// return view;
// }
// view = initView(inflater, container, savedInstanceState);
// return view;
// protected View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container) {
// mCacheRootView = initView(inflater, container, null);
// return mCacheRootView;
// }
private View view;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
if (view != null) {
ViewGroup viewGroup = (ViewGroup) view.getRootView();
if (viewGroup != null) {
viewGroup.removeView(view);
}
return view;
}
view = initView(inflater, container, savedInstanceState);
return view;
}
@Nullable
@Override
public View getView() {
return mCacheRootView;
return view;
}
/**
......
library-base/src/main/java/com/jess/arms/base/BaseFragmentActivity.java
......@@ -64,7 +64,7 @@ import static com.jess.arms.utils.ThirdViewUtil.convertAutoView;
* <a href="https://github.com/JessYanCoding">Follow me</a>
* ================================================
*/
public abstract class BaseFragmentActivity<P extends IPresenter> extends QMUIActivity implements IActivity, ISupportActivity, ActivityLifecycleable {
public abstract class BaseFragmentActivity<P extends IPresenter> extends FragmentActivity implements IActivity, ISupportActivity, ActivityLifecycleable {
protected final String TAG = this.getClass().getSimpleName();
private final BehaviorSubject<ActivityEvent> mLifecycleSubject = BehaviorSubject.create();
private Cache<String, Object> mCache;
......@@ -182,7 +182,7 @@ public abstract class BaseFragmentActivity<P extends IPresenter> extends QMUIAct
*/
@Override
final public void onBackPressed() {
super.onBackPressed();
// super.onBackPressed();
mDelegate.onBackPressed();
}
......
library-base/src/main/java/com/jess/arms/utils/DeviceUtils.java
......@@ -17,6 +17,7 @@ package com.jess.arms.utils;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.Dialog;
import android.content.ActivityNotFoundException;
import android.content.ClipboardManager;
......@@ -1142,6 +1143,27 @@ public class DeviceUtils {
}
return sb.toString().toUpperCase(Locale.CHINA);
}
/**
* 判断服务是否正在运行
*
* @param serviceName 服务类的全路径名称 例如： com.jaychan.demo.service.PushService
* @param context 上下文对象
* @return
*/
public static boolean isServiceRunning(String serviceName, Context context) {
//活动管理器
ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
List<ActivityManager.RunningServiceInfo> runningServices = am.getRunningServices(100); //获取运行的服务,参数表示最多返回的数量
for (ActivityManager.RunningServiceInfo runningServiceInfo : runningServices) {
String className = runningServiceInfo.service.getClassName();
if (className.equals(serviceName)) {
return true; //判断服务是否运行
}
}
return false;
}
}
library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/StytemUtils.java
package com.gingersoft.gsa.cloud.common.utils;
import android.app.ActivityManager;
import android.content.Context;
import java.util.List;
/**
* @作者: bin
* @創建時間: 2021-01-28 15:18
......@@ -7,4 +12,27 @@ package com.gingersoft.gsa.cloud.common.utils;
* @描述:
*/
public class StytemUtils {
/**
* 判断服务是否正在运行
*
* @param serviceName 服务类的全路径名称 例如： com.jaychan.demo.service.PushService
* @param context 上下文对象
* @return
*/
public static boolean isServiceRunning(String serviceName, Context context) {
//活动管理器
ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
List<ActivityManager.RunningServiceInfo> runningServices = am.getRunningServices(100); //获取运行的服务,参数表示最多返回的数量
for (ActivityManager.RunningServiceInfo runningServiceInfo : runningServices) {
String className = runningServiceInfo.service.getClassName();
if (className.equals(serviceName)) {
return true; //判断服务是否运行
}
}
return false;
}
}
library-print/src/main/java/com/gingersoft/gsa/cloud/print/bean/PrjBean.java
......@@ -68,9 +68,13 @@ public class PrjBean {
*/
private int orderType;
/**
* 服務員名稱
* 用户名称
*/
private String userName;
/**
* 服務員名稱
*/
private String memberName;
/***
* 層級
* 1:主食品
......
library-ui/src/main/res/layout/print_kitchen2.xml
......@@ -68,7 +68,7 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="落單時間："
android:text="落單:"
android:textColor="@color/black"
android:textSize="@dimen/sp_18" />
......@@ -96,7 +96,7 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="開檯時間："
android:text="開檯:"
android:textColor="@color/black"
android:textSize="@dimen/sp_18" />
......@@ -125,7 +125,7 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="人數："
android:text="人數:"
android:textColor="@color/black"
android:textSize="@dimen/sp_18"
android:visibility="visible" />
......@@ -146,7 +146,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:text="廚房："
android:text="廚房:"
android:textColor="@color/black"
android:textSize="@dimen/sp_18"
android:visibility="visible" />
......@@ -175,7 +175,7 @@
android:id="@+id/tv_order_num_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="單號："
android:text="單號:"
android:textColor="@color/black"
android:textSize="@dimen/sp_18" />
......@@ -202,7 +202,7 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="取餐碼："
android:text="取餐碼:"
android:textSize="@dimen/sp_18"
android:visibility="gone" />
......@@ -221,7 +221,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="@+id/ll_order"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_take_code">
<TextView
......@@ -229,7 +229,7 @@
style="@style/Print_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="服務員："
android:text="服務員:"
android:textColor="@color/black"
android:textSize="@dimen/sp_18" />
......@@ -247,7 +247,7 @@
android:id="@+id/line_kitchen_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_12"
android:maxLines="1"
android:text="————————————————————————————————————————————"
android:textSize="@dimen/sp_18"
......@@ -359,7 +359,7 @@
<!-- style="@style/Print_text_style"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="落單時間："-->
<!-- android:text="落單時間:"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="@dimen/sp_18" />-->
......@@ -382,7 +382,7 @@
<!-- android:id="@+id/tv_order_num_text"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="單號："-->
<!-- android:text="單號:"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="@dimen/sp_18" />-->
......@@ -406,7 +406,7 @@
<!-- style="@style/Print_text_style"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="取餐碼："-->
<!-- android:text="取餐碼:"-->
<!-- android:textSize="@dimen/dp_20"-->
<!-- android:visibility="gone" />-->
......@@ -429,7 +429,7 @@
<!-- style="@style/Print_text_style"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="落單時間："-->
<!-- android:text="落單時間:"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="@dimen/sp_18" />-->
......@@ -462,7 +462,7 @@
<!-- style="@style/Print_text_style"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="開檯時間："-->
<!-- android:text="開檯時間:"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="@dimen/sp_18" />-->
......@@ -508,7 +508,7 @@
<!-- style="@style/Print_text_style"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="人數："-->
<!-- android:text="人數:"-->
<!-- android:textColor="@color/black"-->
<!-- android:textSize="@dimen/sp_18"-->
<!-- android:visibility="visible" />-->
......
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