diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 1a9aeca..e860d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -60,6 +60,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 1a9aeca..e860d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -60,6 +60,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index d811ab5..a860cdf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -147,6 +147,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 1a9aeca..e860d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -60,6 +60,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index d811ab5..a860cdf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -147,6 +147,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 7b050da..c9a1e73 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -148,6 +148,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 1a9aeca..e860d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -60,6 +60,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index d811ab5..a860cdf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -147,6 +147,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 7b050da..c9a1e73 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -148,6 +148,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 21222b5..fcf0071 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -81,6 +81,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 1a9aeca..e860d71 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -60,6 +60,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index d811ab5..a860cdf 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -147,6 +147,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index 7b050da..c9a1e73 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -148,6 +148,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 21222b5..fcf0071 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -81,6 +81,7 @@ alarmContentView.text = orderDetail.alarmContentName alarmDateView.text = orderDetail.alarmTime orderCodeView.text = orderDetail.jobCode + deptNameView.text = orderDetail.deptName wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode val level = orderDetail.alarmLevel.toString() diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml index 242eafb..7554ad8 100644 --- a/app/src/main/res/layout/include_base_order_detail.xml +++ b/app/src/main/res/layout/include_base_order_detail.xml @@ -56,6 +56,22 @@ + + + + + + + + +