From 1a7e646b44678db1f413e092a6e13ddae871f873 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 19 Aug 2024 18:39:26 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=E6=8E=A5=E7=AE=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/takeover/RecordManager.kt | 2 +- .../workorder/TakeOverReasonWindow.kt | 2 +- .../workorder/TakeOverRecordView.kt | 88 +++++++++++++++++- .../workorder/adapter/BottomDecoration.java | 10 +- .../workorder/adapter/TakeOverListAdapter.kt | 41 +++++++- .../main/res/drawable/bg_take_over_record.png | Bin 0 -> 30085 bytes .../res/drawable/icon_record_check_false.png | Bin 0 -> 2230 bytes .../res/drawable/icon_record_check_true.png | Bin 0 -> 3389 bytes .../drawable/record_radio_button_style.xml | 4 +- .../main/res/layout/item_take_over_record.xml | 17 +++- .../main/res/layout/view_take_over_record.xml | 2 +- 11 files changed, 148 insertions(+), 18 deletions(-) create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable/bg_take_over_record.png create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_false.png create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_true.png diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt index d6457f8dda..e7235038a0 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/RecordManager.kt @@ -87,7 +87,7 @@ object RecordManager { /** * 删除接管记录 * @param context 上下文 - * @param recordInfo 接管数据实体 + * @param takeOverRecordInfo 接管数据实体 */ fun deleteRecord(context: Context, takeOverRecordInfo: TakeOverRecordInfo) { takeOverRecordInfo.let{ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt index 588ed999dd..e5110e6f51 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverReasonWindow.kt @@ -105,7 +105,7 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene it.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL it.gravity = Gravity.START or Gravity.TOP it.width = 844 - it.height = 991 + it.height = 846 it.alpha = 1.0f } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt index 91b665f12e..dcb6d4d8a7 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt @@ -4,15 +4,24 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout +import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.eagle.core.data.deva.report.TakeOverRecordInfo import com.mogo.eagle.core.function.call.takeover.CallerTakeOverManager +import com.mogo.eagle.core.utilcode.util.TimeUtils +import com.mogo.eagle.core.utilcode.util.TimeUtils.getYMDFormat import com.zhjt.mogo_core_function_devatools.R +import com.zhjt.mogo_core_function_devatools.workorder.adapter.BottomDecoration import com.zhjt.mogo_core_function_devatools.workorder.adapter.TakeOverListAdapter import kotlinx.android.synthetic.main.view_take_over_record.view.ivTakeOverRecordClose import kotlinx.android.synthetic.main.view_take_over_record.view.rvTakeOverList +import kotlinx.android.synthetic.main.view_take_over_record.view.tvDeleteSelect +import kotlinx.android.synthetic.main.view_take_over_record.view.tvTakeOverRecordDate +import kotlinx.android.synthetic.main.view_take_over_record.view.tvUpload import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import me.jessyan.autosize.utils.AutoSizeUtils /** * 接管信息管理页面 @@ -40,15 +49,86 @@ class TakeOverRecordView @JvmOverloads constructor( ivTakeOverRecordClose.setOnClickListener { clickListener?.onClose() } - takeOverListAdapter = TakeOverListAdapter() + //接管记录日期 + tvTakeOverRecordDate.text = TimeUtils.millis2String(System.currentTimeMillis(), getYMDFormat()) val linearLayoutManager = LinearLayoutManager(context) rvTakeOverList.layoutManager = linearLayoutManager + takeOverListAdapter = TakeOverListAdapter(context) + takeOverListAdapter?.setListener(object: TakeOverListAdapter.RecordClickListener{ + override fun onEditRecord(takeOverRecordInfo: TakeOverRecordInfo) { + //展示接管原因窗口 + val activity = context as? FragmentActivity + ?: throw IllegalStateException("please ensure context is FragmentActivity.") + val takeOverReasonWindow = TakeOverReasonWindow(activity) + takeOverReasonWindow.showFloatWindow() + } + }) + rvTakeOverList.addItemDecoration( + BottomDecoration( + AutoSizeUtils.dp2px(context, 194f) + ) + ) rvTakeOverList.adapter = takeOverListAdapter - GlobalScope.launch(Dispatchers.IO){ - CallerTakeOverManager.getAllRecord(context) - } + val list = ArrayList() +// GlobalScope.launch(Dispatchers.IO){ +// list = CallerTakeOverManager.getAllRecord(context) +// } + + val takeOverRecordInfoOne = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineNamelineNamelineNamelineNamelineNamelineNamelineNamelineNamelineNamelineName","描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1描述1",false) + val takeOverRecordInfoTwo = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述2",false) + val takeOverRecordInfoThree = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述3",true) + val takeOverRecordInfoFour = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述4",true) + val takeOverRecordInfoFive = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述5",false) + val takeOverRecordInfoSix = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述6",false) + val takeOverRecordInfoSeven = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述7",false) + val takeOverRecordInfoEight = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述8",true) + val takeOverRecordInfoNine = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述9",false) + val takeOverRecordInfoTen = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述10",true) + + list.add(takeOverRecordInfoOne) + list.add(takeOverRecordInfoTwo) + list.add(takeOverRecordInfoThree) + list.add(takeOverRecordInfoFour) + list.add(takeOverRecordInfoFive) + list.add(takeOverRecordInfoSix) + list.add(takeOverRecordInfoSeven) + list.add(takeOverRecordInfoEight) + list.add(takeOverRecordInfoNine) + list.add(takeOverRecordInfoTen) + + takeOverListAdapter?.setData(list) + + //一键上传 + tvUpload.setOnClickListener { + val takeOverRecordInfoOne = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述1",false) + val takeOverRecordInfoTwo = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述2",false) + val takeOverRecordInfoThree = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述3",true) + val takeOverRecordInfoFour = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述4",true) + val takeOverRecordInfoFive = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述5",false) + val takeOverRecordInfoSix = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述6",false) + val takeOverRecordInfoSeven = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述7",false) + val takeOverRecordInfoEight = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述8",true) + val takeOverRecordInfoNine = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述9",false) + val takeOverRecordInfoTen = TakeOverRecordInfo(System.currentTimeMillis().toString(),"环球贸易中心",1,2,3,"lineName","描述10",true) + + + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoOne) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoTwo) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoThree) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoFour) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoFive) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoSix) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoSeven) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoEight) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoNine) + CallerTakeOverManager.insertRecord(context,takeOverRecordInfoTen) + } + //删除 + tvDeleteSelect.setOnClickListener { +// CallerTakeOverManager.deleteRecord(context,) + } } fun setOnClickListener(clickListener: ClickListener) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/BottomDecoration.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/BottomDecoration.java index 3b702ff0f9..512c91ba8c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/BottomDecoration.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/BottomDecoration.java @@ -6,6 +6,8 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import java.util.Objects; + public class BottomDecoration extends RecyclerView.ItemDecoration { /** * 第一个视图和最后一个视图偏移的距离 @@ -16,7 +18,7 @@ public class BottomDecoration extends RecyclerView.ItemDecoration { * 设置RecyclerView子视图的边距，本示例仅用于定义两个子视图之间的边距，为space*2 */ public BottomDecoration(int distance) { - this.distance = distance; + BottomDecoration.distance = distance; } @Override @@ -24,10 +26,8 @@ public class BottomDecoration extends RecyclerView.ItemDecoration { int pos = parent.getChildAdapterPosition(view); RecyclerView.LayoutParams layoutParams = (RecyclerView.LayoutParams)view.getLayoutParams(); - /** - * 通过设置Item左右边距实现第一个左侧和最后一个右侧设置边距,确保显示的视图位于屏幕中间 - */ - int itemCount = parent.getAdapter().getItemCount(); + //通过设置Item左右边距实现第一个左侧和最后一个右侧设置边距,确保显示的视图位于屏幕中间 + int itemCount = Objects.requireNonNull(parent.getAdapter()).getItemCount(); if(pos == itemCount-1){ layoutParams.setMargins(0,0,0,distance); }else { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt index 3eff0b4be8..5bf2d30005 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt @@ -1,21 +1,25 @@ package com.zhjt.mogo_core_function_devatools.workorder.adapter +import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.CheckBox import android.widget.ImageView import android.widget.TextView +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.deva.report.TakeOverRecordInfo +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhjt.mogo_core_function_devatools.R /** * 接管记录适配器 */ -class TakeOverListAdapter: RecyclerView.Adapter() { +class TakeOverListAdapter(private val context: Context): RecyclerView.Adapter() { private var data:List ?= null + private var clickListener: RecordClickListener ?= null fun setData(data: List){ this.data = data @@ -31,6 +35,32 @@ class TakeOverListAdapter: RecyclerView.Adapter;HEt{J9+Z*_BZ!SkC<+$3)FB%~Dd}Pz zBT71TvLG;spn>XA)G16l3DzO-(5a{p`rgbNowci{`W=>?oq2C(_Tzj1_y7Li``%6* z9O$d7X{}L8)fEf*L8a_KDaUgiIWu!&+h=*RE)MqP)b#tduks;(W~eya-> zXH{A^kyop{r2CYmY;?d<&W6CK%7;djlb`8{byW#;RGhKeu?)AlruFm64m3A2Ot-BA8 z6=J)D_wDkRDt@oqk*=N3zsofyyNao*FcqfK?uA#$NMrzN@Bphcz60wrH82C}SroD$ ztO2s12^M4lvJet%$bxnR$U+pqK^7njCbEVsKo%lsge-(Q8Oj36f)Pwn7El(9ERC{& zvS2b6C<`bHaT*G;09k-6m^l)%09i0|BxC`y5YLgMAtKS0H4EA!ShGMHB3?8`8iF(g zX$YgflZGG-VN&(l5GV_f1(XGp1(x_z4M8=8W{IO?6pm!F)Y#}bfpR1n5nhhUEjL4v zn+_MK2b6Gu(n%daQaTA)FmV%P0kU8ck&p##h_xgOmyd3Ft<&AjjlH2yzH=B4|Vr4fEzGq9~%FBdl$Z0|kYG{+ATA{OQrDlknm4HLiU+cx3K5U`C0uJsKwra{B*8#?GN^+#@he@ literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_false.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_check_false.png new file mode 100644 index 0000000000000000000000000000000000000000..aa2ccad38f679b4a4fe49ebef385f4ca7a2c5e5e GIT binary patch literal 2230 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 Tw_Pz400000NkvXXu0mjf>Tgu% literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/record_radio_button_style.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/record_radio_button_style.xml index 2b50242af5..f05e99720f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/record_radio_button_style.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/record_radio_button_style.xml @@ -2,8 +2,8 @@ + android:drawable="@drawable/icon_record_check_false" /> + android:drawable="@drawable/icon_record_check_true" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml index 0e24c865bc..3963cc4126 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_take_over_record.xml @@ -6,12 +6,13 @@ + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml index 2cc90ddbf1..b5db31cebe 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_record.xml @@ -3,7 +3,7 @@ android:layout_width="@dimen/dp_960" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="#F0151D41"> + android:background="@drawable/bg_take_over_record">