From af7a388b846eaf061567416c044d70d5a0f99486 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 22 Aug 2024 19:38:08 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=E6=95=B0=E6=8D=AE=E9=97=AD=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 24 ++-- .../workorder/FaultReasonWindow.kt | 111 +++++++++++++++++- .../workorder/ReportTypeWindow.kt | 14 ++- .../workorder/TakeOverReasonWindow.kt | 17 ++- .../workorder/TakeOverRecordView.kt | 57 +++++---- .../workorder/WorkOrderManager.kt | 2 +- .../workorder/WorkOrderNetWorkModel.kt | 2 +- .../workorder/adapter/TakeOverListAdapter.kt | 1 - .../main/res/drawable/icon_record_no_data.png | Bin 0 -> 13561 bytes .../src/main/res/layout/view_fault_reason.xml | 2 +- .../src/main/res/layout/view_report_type.xml | 2 +- .../main/res/layout/view_take_over_reason.xml | 2 +- .../main/res/layout/view_take_over_record.xml | 24 ++++ .../src/main/res/values/strings.xml | 4 +- .../api/devatools/IMoGoDevaToolsListener.kt | 2 +- .../CallerDevaToolsListenerManager.kt | 4 +- 16 files changed, 209 insertions(+), 59 deletions(-) create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_no_data.png diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index ebd9af2845..f01ca7f96c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -1,6 +1,7 @@ package com.zhjt.mogo_core_function_devatools.badcase +import android.annotation.SuppressLint import android.app.Activity import android.content.Context import android.graphics.Bitmap @@ -74,6 +75,8 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis private var record: AutoPilotRecord? = null private var recordKey: Long = 0 //主动录制bag包key + @SuppressLint("StaticFieldLeak") + private var reportTypeWindow: ReportTypeWindow ?= null fun init(context: Context) { CallerAutopilotRecordListenerManager.addListener(TAG, this) @@ -191,18 +194,19 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis view.setOnClickListener{ if (ClickUtils.isFastClick()){ if (NetworkUtils.isConnected()){ - //TODO 更改dockerVersion是否为空 - if (BadCaseConfig.dockerVersion == null){ + if (BadCaseConfig.dockerVersion != null){ if(ProjectUtils.isSaas()){ //660版本数据闭环增加统一上报问题入口（仅限于saas渠道） - //TODO 已存在WIndow再次点击会再次创建WIndow - val reportTypeWindow = ReportTypeWindow(activity) - reportTypeWindow.setClickListener(object: ReportTypeWindow.ClickListener{ - override fun closeWindow() { - reportTypeWindow.hideFloatWindow() - } - }) - reportTypeWindow.showFloatWindow() + if(reportTypeWindow == null){ + reportTypeWindow = ReportTypeWindow(activity) + reportTypeWindow?.setClickListener(object: ReportTypeWindow.ClickListener{ + override fun closeWindow() { + reportTypeWindow?.hideFloatWindow() + reportTypeWindow = null + } + }) + reportTypeWindow?.showFloatWindow() + } }else{ //展示工单上报弹窗 val workOrderWindow = WorkOrderWindow(activity) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt index df4c2c8412..0917bac5be 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt @@ -5,6 +5,8 @@ import android.annotation.SuppressLint import android.app.Activity import android.graphics.PixelFormat import android.os.Bundle +import android.os.Handler +import android.os.Looper import android.text.Editable import android.text.TextWatcher import android.util.DisplayMetrics @@ -27,28 +29,44 @@ import androidx.constraintlayout.widget.Group import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.amap.api.services.core.LatLonPoint +import com.amap.api.services.geocoder.GeocodeResult +import com.amap.api.services.geocoder.GeocodeSearch +import com.amap.api.services.geocoder.RegeocodeQuery +import com.amap.api.services.geocoder.RegeocodeResult import com.iflytek.cloud.ErrorCode import com.iflytek.cloud.InitListener import com.iflytek.cloud.RecognizerListener import com.iflytek.cloud.RecognizerResult import com.iflytek.cloud.SpeechError import com.iflytek.cloud.SpeechRecognizer +import com.mogo.commons.storage.SharedPrefsMgr +import com.mogo.eagle.core.data.app.AppConfigInfo +import com.mogo.eagle.core.data.deva.report.CategoryInfo +import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadProblemInfo +import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener +import com.mogo.eagle.core.function.api.order.IOrderListener +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager +import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.JsonParser +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.tts.base.SpeechUtils import com.zhjt.mogo_core_function_devatools.R import com.zhjt.mogo_core_function_devatools.workorder.adapter.OrderReasonAdapter -import kotlinx.coroutines.DelicateCoroutinesApi import kotlin.math.absoluteValue /** * 故障原因编辑窗口 */ -class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ +class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, + IMoGoDevaToolsListener, IOrderListener { companion object{ const val TAG = "FaultReasonWindow" @@ -93,6 +111,15 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ private lateinit var orderReasonAdapter: OrderReasonAdapter + private var address: String = "" //故障地点 + private var faultCodeList = ArrayList() //故障码列表 + private var level1Id: Int = 0 //一级分类ID + private var level2Id: Int = 0 //二级分类ID + private var level3Id: Int = 0 //三级分类ID + private var lineName: String = "" //行驶路线 + private var reportNote: String = "" //上报描述 + private val reportType: Int = 2 //上报方式：0：小程序 1：司机屏 2：云端上报 + init { initFloatWindow() } @@ -158,6 +185,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ @SuppressLint("SetTextI18n") private fun initEvent(){ + CallerDevaToolsListenerManager.addListener(TAG, this) + CallerOrderListenerManager.addListener(TAG,this) val iconDown = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_expand) iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight) val iconUp = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_retract) @@ -268,7 +297,30 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ } //上报 tvFaultReport.setOnClickListener{ - //TODO + CallerOrderListenerManager.invokeOrderLineUpdate("测试") + + val geocodeSearch = GeocodeSearch(mActivity) + geocodeSearch.setOnGeocodeSearchListener(object: GeocodeSearch.OnGeocodeSearchListener { + override fun onRegeocodeSearched(regeocodeResult: RegeocodeResult?, p1: Int) { + regeocodeResult?.regeocodeAddress?.formatAddress?.let { + address = it + } + val padProblemList= ArrayList() + val padProblemInfo = PadProblemInfo(address,faultCodeList,millis2String(workOrderOccurrenceTime),level1Id, + level2Id,level3Id,lineName,reportNote,reportType, + SharedPrefsMgr.getInstance().getString("och_account","")) + padProblemList.add(padProblemInfo) + val padAddProblemReq = PadAddProblemReq(padProblemList,AppConfigInfo.plateNumber) + CallerDevaToolsManager.problemPadAdd(padAddProblemReq) + } + + override fun onGeocodeSearched(p0: GeocodeResult?, p1: Int) { + + } + }) + val latLon = LatLonPoint(CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().latitude, CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().longitude) + val q = RegeocodeQuery(latLon,200f,GeocodeSearch.AMAP) + geocodeSearch.getFromLocationAsyn(q) } //取消 tvFaultCancel.setOnClickListener { @@ -306,6 +358,10 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ } } + /** + * 初始化监听器。 + */ + /** * 初始化监听器。 */ @@ -315,6 +371,10 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ } } + /** + * 听写监听器。 + */ + /** * 听写监听器。 */ @@ -353,6 +413,10 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ } + /** + * 显示结果 + */ + /** * 显示结果 */ @@ -416,10 +480,11 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ } fun hideFloatWindow() { + CallerDevaToolsListenerManager.removeListener(TAG) + CallerOrderListenerManager.removeListener(TAG) if (mFloatLayout.parent != null){ mWindowManager!!.removeView(mFloatLayout) } - CallerDevaToolsListenerManager.removeListener(TAG) } fun setClickListener(clickListener: ClickListener) { @@ -430,4 +495,42 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{ fun closeWindow() } + /** + * 故障上报成功 + */ + override fun problemPadAddSuccess() { + super.problemPadAddSuccess() + //显示上报成功页面，短暂停留关闭弹窗 + ThreadUtils.runOnUiThread { + rvFaultList.visibility = View.GONE + tvUploadSuccess.visibility = View.VISIBLE + faultReasonGroup.visibility = View.GONE + val successHandler = Handler(Looper.getMainLooper()) + successHandler.postDelayed({ + hideFloatWindow() + },1500) + } + } + + override fun problemPadAddError(msg: String) { + super.problemPadAddError(msg) + ToastUtils.showShort("故障原因上报失败$msg") + } + + override fun getCategoriesSuccess(list: List) { + super.getCategoriesSuccess(list) + } + + override fun getCategoriesError(msg: String) { + super.getCategoriesError(msg) + } + + /** + * 订单路线名称变化监听 + * @param lineName 路线名称 + */ + override fun onOrderLineUpdate(lineName: String) { + this.lineName = lineName + } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt index 76132ee3d0..af5a73474b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt @@ -4,6 +4,8 @@ import android.annotation.SuppressLint import android.app.Activity import android.graphics.PixelFormat import android.os.CountDownTimer +import android.os.Handler +import android.os.Looper import android.os.SystemClock import android.util.DisplayMetrics import android.view.Gravity @@ -125,11 +127,17 @@ class ReportTypeWindow constructor(activity: Activity) { BadCaseConfig.type, Random(SystemClock.elapsedRealtime()).nextInt().absoluteValue, BadCaseConfig.totalDuration, BadCaseConfig.previousDuration) if(response){ - ToastUtils.showShort("主动录包命令下发成功") + //已发起录包 + reportTypeGroup.visibility = View.GONE + tvReportSuccess.visibility = View.VISIBLE + tvReportSuccess.text = mActivity.resources.getString(R.string.record_success) + val successHandler = Handler(Looper.getMainLooper()) + successHandler.postDelayed({ + clickListener?.closeWindow() + },1500) }else{ ToastUtils.showShort("主动录包命令下发失败") } - clickListener?.closeWindow() } } @@ -139,7 +147,7 @@ class ReportTypeWindow constructor(activity: Activity) { val metrics = DisplayMetrics() // 默认固定位置，靠屏幕右边缘的中间 mWindowManager!!.defaultDisplay.getMetrics(metrics) - mWindowParams!!.x = metrics.widthPixels-2257 + mWindowParams!!.x = metrics.widthPixels-2258 mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-420 mWindowManager!!.addView(mFloatLayout, mWindowParams) } 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 67173ce888..0ea8899aa9 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 @@ -33,6 +33,8 @@ import com.iflytek.cloud.RecognizerListener import com.iflytek.cloud.RecognizerResult import com.iflytek.cloud.SpeechError import com.iflytek.cloud.SpeechRecognizer +import com.mogo.eagle.core.data.deva.report.CategoryInfo +import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.JsonParser @@ -48,7 +50,8 @@ import kotlin.math.absoluteValue /** * 接管原因编辑窗口 */ -class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListener { +class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListener, + IMoGoDevaToolsListener { companion object{ const val TAG = "TakeOverReasonWindow" @@ -150,6 +153,7 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene @SuppressLint("SetTextI18n") private fun initEvent(){ + CallerDevaToolsListenerManager.addListener(TAG, this) val iconDown = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_expand) iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight) val iconUp = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_retract) @@ -246,7 +250,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene } //上报 tvTakeOverReport.setOnClickListener{ - //TODO + //TODO 保存到数据库‘ + hideFloatWindow() } //取消 tvTakeOverCancel.setOnClickListener { @@ -407,4 +412,12 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene fun closeWindow() } + override fun getCategoriesSuccess(list: List) { + super.getCategoriesSuccess(list) + } + + override fun getCategoriesError(msg: String) { + super.getCategoriesError(msg) + } + } \ No newline at end of file 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 035bc9c793..7b00d13e9b 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,19 +4,25 @@ import android.content.Context import android.util.AttributeSet import android.util.Log import android.view.LayoutInflater +import android.view.View 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.kotlin.lifeCycleScope +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.getYMDFormat +import com.mogo.eagle.core.utilcode.util.Utils 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.recordGroup 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.tvRecordNoData 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 @@ -37,6 +43,10 @@ class TakeOverRecordView @JvmOverloads constructor( const val TAG = "TakeOverRecordView" } + private val scope by lazy { + Utils.getApp().lifeCycleScope + } + private var takeOverListAdapter: TakeOverListAdapter ?= null private var clickListener: ClickListener? = null private val selectedUploadRecord = ArrayList() @@ -83,36 +93,6 @@ class TakeOverRecordView @JvmOverloads constructor( ) rvTakeOverList.adapter = takeOverListAdapter - 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 { @@ -121,6 +101,23 @@ class TakeOverRecordView @JvmOverloads constructor( tvDeleteSelect.setOnClickListener { // CallerTakeOverManager.deleteRecord(context,) } + + scope.launch(Dispatchers.IO){ + val recordList= CallerTakeOverManager.getAllRecord(context) + ThreadUtils.runOnUiThread { + if(recordList.isEmpty()){ + tvRecordNoData.visibility = View.VISIBLE + recordGroup.visibility = View.GONE + }else{ + tvRecordNoData.visibility = View.GONE + recordGroup.visibility = View.VISIBLE + //更新列表 + takeOverListAdapter?.setData(recordList) + } + + } + } + } fun setOnClickListener(clickListener: ClickListener) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt index 3fb31414b1..0966002228 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt @@ -75,7 +75,7 @@ class WorkOrderManager{ CallerDevaToolsListenerManager.invokeProblemPadAddSuccess() }, onError = { - CallerDevaToolsListenerManager.invokeProblemPadAddError() + CallerDevaToolsListenerManager.invokeProblemPadAddError(it) } ) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt index 2d99a2f7af..e73afa83d4 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt @@ -53,7 +53,7 @@ class WorkOrderNetWorkModel { onSuccess.invoke("") } onError{ - onError.invoke("") + onError.invoke(it.message+"") } } } 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 5cf55c2ad3..17fb69cfa8 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 @@ -35,7 +35,6 @@ class TakeOverListAdapter(private val context: Context): RecyclerView.Adapter clickListener?.onSelectRecord(recordEntity,isChecked) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_no_data.png b/core/function-impl/mogo-core-function-devatools/src/main/res/drawable/icon_record_no_data.png new file mode 100644 index 0000000000000000000000000000000000000000..246b3c4f38d897ddb0844379c786964f3191b4a6 GIT binary patch literal 13561 zcmbtb<98kH*FI^i6Sa*_Y~#c>8{4*RJB@9#vD3J58l$mon{S>kzklHUaL;|u%(Z4_ z&1_uz+G`@@WyO&Za1a0h0J5Znh~npb_c=D;U_Q6>p~|Gw@|JED-0Sy;?6951f zBS{fKWp{`(ANZ^+ahHRN=jyKZgCsE=ysn+ZP3gr!_1?`zC=ABon5%$*0jO{YZq$aC z71lF7bi*)xw%UooINE;rOp)b&qRcof5bbxvdR=bJMTlKUtuV4^vBLD6biS^_`;V@i zc-EP*GOrS^w(fK4c2=J`wT+60VscY-vK)1v^>5ziN zuMvF8Oc8SmtZLU)o0%Sgb7knam4sJV@o$GoK9A{mdOmg*WKM zsWHPwO#1~zEiF#OqdJhsTsO2OESQJWgKXg};D(7#}cIcM5 z-8oySd05G~{6+|j<07wK(9hLeN|Sh@E%^|%tIfTQLikw7q5 zJzlykt}mu<-@Grav`s#+?v7q!f3{0?Ak0mzS!=j&G7jG$W~NtzplNkwYB-69Hizjc zW?Y~tmmU2P`+g$VoYN5NdKzwMc6{_0=+ac88^@ac)~7O=)g&l&vtu8qgAawzg=>Rk zPmqLOqZayfWi{P0k+QzsIh&`O#gF%N!pi>UFvt>Aq2FU$HIZG2eE2JFb1rC5b+?Ze;3cdn$t`-3x=4KA`e z9$8txhozD$`&p~);@j@kYIQutlq>|BajkcvXwUR;mzLYUT?pf%7XI{47DkqTcY>x8l1T`GKZ~XadlnSkZyuD{saXg~7{AfWI zkpA34V&T6ESgO>~FLOYR63I|_d6M2J!Lv5{nr7dmd+l1^?d>9c3*Pq;XUyh#JsPG+nt|8KH8sA{v>8@4>8qO$w-(-sw%kAbz;l* z{wroU#T>3d1I~-3Yam2HB?@~8wb0bMoKzD<<+z~lI)=laT=3UgOiDCB300tD2Q zm`sHtpB$P^@MPEj9zzO`g}v^D>Lb6RZlw=5dV7A0+`aJGvI=9{BT&P$$+whe;32+c zsM_v9%3GRSZ*{;Mvw^L!yYu&;-%_bMPh_d22~q5he>)oH^yu%Jtop~9%hha@O;SLA z0$)p0l&4}JYO~1rqYewe8=J1fpw@~!zij>%ono=N*09xAdKu=q5+US+d`u}(USY1B zG+tt1Zq7QebA?TzZiLm-1KjBgX$8IvZCs`Eudc16rL0tZLq5Jw5O-68q_a^czk7HH z>9GwB%Lzah?g_>AH45D>wOcD8Zq@I8WSsubzMmID9sHHh;Dha@m@gAxbRS3W8MGEa z-v&R56D5z2#zS>&-@C8}9+tqe2hfT(zYAI^7NWcw>&Ij6zceS*J+G_eAyg7B#o$@4 z>q5m8F_%;8qv5JjtD1Xz2Mz-9N=8P??bE3<$K{zvUKlfi&27`0ngYzf?b*4~T%&oj zE=yj|3>N>?Io-Z)tz_{&pdpXflj2pmjJKvlHxb5BrLI3`8^Lb_oi=buuJMTd2vs(|3}s zQ*#T!L)O%-*X;I1?&W_GR`Mo$?p?;=YNsH)h+32z%;^uiN^ZT7S``lRBx_w2eb5)+ zPLVlbt1LzaIJ15^RbiYQilpv|8(DG9`!g+cLwiBea^OXnorn>x--LEi8BKsQC*EJV z!4e1=%2GSn5gCeBY6G!qy+5z33NxkRsmy^FCq!nvNyh(j*=1aURi<{D@6UFAd9Bqf zG7nnFtM=(X%AnW;Sgn$>=^_E|4Rt{k7*iDH9q|0H2qOr*AIu5!mP4i5oPvS`(R||V zlWSLd3>P2o?A@I1_AmE`HarV?w!QjC^W+{8)L~d>Kge-7KfEV*OqzezO}WdQE#)6%=7Ji+$kLuo>PKdWk`S(NF{Li*wbs9Mks0I6=3 zn2^b{(e63Bc*41%K^h6;LfZe8jJU8OKX#AV$~uN8sAAKRn<{RB4o5VI3&+vYj~b2W zJ7LLk)#VlYnVfCaR~WwB=lqE>C^0+bdwnbU1!^4~I|ZPAJ4`Z-33aLzfb{_JB&zDK z0SDE6ItOX|!rAQ4>pUIbxjb7;Ns(;ek0KhARB{9*duCBK+Z_(7-~)Y{jQ$+viCWZ% z0zo`@rY8RQ%2du~FY8nL)|+2%RMpW!6TQSpS38b*gV!Dka_-tT?B+sr$j9W2O;(w~ z%{jf_|Gq6csL+1rtRLRNTM=tov+P zU{7ajISIic>N0;&9Yu&QWFFPQg%gr0ghhynDx&2#95Yr-Ni&=w7&fCE!x^}E89IA_Ol;%PJ&__-J_hYw1@`4 zVlDE?jx2WD@y~q26Jma+4LORM2}c&^C=Z7Gl@5LOA~AP~4uneMy7IA?#gwEpVTG=D zm8$PL8!fjZSpDs4r<`RZ{-6-_Y;Jq_fV>CD+8!zm(MFG zg_vFWc$V{f5*F6zq(hF)+$eKH&9fr_HlCY(Z!|d?De9!CL(4ll*+nd<;hjB3* zRePvLu_z ztP&H^y))6W3_x7Er3Rin_Lqtj*6<=S? zOS;Xpkt0tKkIv(tz!_3nsT&fs?X@M^u-4|tyTUQ%hu(b7I z#ma>0&S_Z64`af=ZBg7l?V6WX1<%3T?MJMO`2K-E%-ySZ#7xU}2E%D%!{j;EFHk)L zJII0Ndzzk{dX*wRgRIL$UA+Rj6ph8dJX^AdRF8`)trqNo$IIi@31PcSIz;{NsRm8d zcs+%9fT=cT3Rsph66%K)0?)tb{ONpE@~Q-gBKC=-BqL6yFpczU;}FQl;UoOob|n`F z&x2~&T4S=^HQw&8I>nA;0VEqF^NCNx*-iA$EGyot<#*i3$C{k~jy*Zvc>FFJMx-1U z27Q|>D^TBMO338kAB-;1Rgy^l2+{5k7@*4LkoICPaCo4D7B+SN)_zh?gay@G9I|uo z%@?MFu7d?x&N?gPYrA;T$-Y|lK*HlpdQ%qg1*&kXC3QOaN`#VuV^+!4cF?(VdG4p- z-`!XbRJZQOWKTR*+yhl3-_&4II>u4A(R+GS7X?KHgJECM#*r9z#*Rg(MazE>3?yPZ zI#l27DjN*AuST%X(@%0E{vDYe<2!1jp`ckO$DQ6IjYtB$Q8~Xa;j+GhHvR1EgEhn%`tM^(i+y z$KzxF4VudNYh=LO+fYztS6P};o!P%@LpzZYsMxRs{wgw;ZwZmugc{|?dx*-$mALQf zd)Sq^{GJ_x9FGPIW&sj554 zj^lD+QuPOxCc_WeG0Agd}~Ht4)vQbYjM==7tR?nAX?z7_pSEftyTzoU?l;JV^9Q-ohn-g`&SNPWbz? z)-)6{inT!>%>5m)b7@2w=wuEn#+EWo!X2U>4>3KLX)e#6-1%>CBiFB4Jfh#P7U@K- z?x|qXj8WWi3aqWLSZG7&K~&H^!`P5$AE=QAhJDnv+Nb`h`Sck*5`TB!P3T;yjLc+) zSGL!M{bJ8p_MlHQa*a}4(qJSBAo2zFa^C#tB)?H+@8>n z-h`6U5l4*m!ya{u$*rd1(r#yi+0Fu-IT=s_St+WT?y)1FPvAa~e7&4WW|GfUC~G@c zokuq4O+&NOl=W`6{?fbRb5BiHrtnqQjxu0PvTCAii<%~HH=syL&mYIX*MD5*g( z6(wg=yS+6o>t+x>QVy)dX0(dEzX}Rza&puk68LT0p@y?<%7Hl%_ljEM*kCyVb&Df7 zua$g6kns0?Uc-*#p*y$Z=&H2k<2+?#M@##i{h79E@5cVmchYUX_-Qbr-c_KB<`X2O z$Gt(HX=6lByf&BQ$pXrZB(AEGog5cWVH?8!Qbtu#Yv=j6|3noo*MM84TxM^pIHkk) z878CLc3c?rE3vGl)Eernm;43N6Bwev4L2l@wH5w%ciRB`D}Rmayy*;2h-%mCg@#Kc zap1Nx-e{3BH4ybibr@=i13FPyrO8y+`D^%N#y>O6H$pp!6Y5-Qbr|(VK5x`;<(^Ub z{qo+VTxpe8U%-ps>z?15eYkX`A2}a#ZU|#h4X~De9a=G`C7Co!G*P1yQ}tOSJk(0oR9 zRa(ZIXo#n7bLk!26Z)bJ-n&)1*HI@uZ)p!%qap99Jibt(?E5Q~aU?b5W&NR3@`%J(pP%N(#?dh z-uxe`0w`4V=)KOdC-~oQV_ti4w1Pb8ak-C`;LOX+R+0ct|HjTo$ZO9l|8#%^yOkZ; z)fID~St#_^X-mtexOxM6e>VSda#+u#4{=DQ>F7Hd>X6%BZ)c3pc-UWl>7?W?d?As> z&G{}hNUPb|hPi$!sL7j#2r+Kj%+{1jua&v$Ni>EJwNXjvOQ-<6SJ++_SWMk;T>+Zq zte%TEp^!}$&Qn}(&?WHusX{3aMx1|65DmZp%; zx%nNo^D@K|vZxu1b@eL36sn*zF{AlI#dwKF!9Af3!{^K;v1 zvmq0`cyqwH0pau_KgWM&7qfRo(bQEAC{TSECu0;o@$5s~e3sH4Y3O$~y}M5Uwt0bq z_2iUk28^^mIFmm+W8jQ?%FARz;%>?>PgQmL&elW)pZ>TV_1;y%DbHrE2w%5=D)zh0 zuYTaPCn5AJ^QF%RymXu2M|bz_d`QWh{BD~$&>RRF3UISt<{=N-Y&RZ$1Grep;KQ(B zS0i+op~>C$h`3(vg%pgmlHkk@MJV~@a|$@W-Sx63)OAC};fFkU<;L~yK)&~4maui) zZ=7Ok!P!Usme6DhBy048L)yVNB7VHTe_a}aikM7JyDu5r3wtl(v=4^V>%2(F?fRG) z;y-~N?DF5utd;G=VPpJqkjXthxbsCi-hTQinR$PzJuc)P-Z7AW<>u>~gk2{OG5(vF zlfDJ$F=*1x<9q@(r`66m^?_Yio^K6K1O_)dGtx4KatI%or3X57qdf@2XlL+ncyV0^ zs%lMVw6XCWY3hsxOm4VPaTn)gc{K4-+-9|%i59`nfy!e4<7`*b3-cgzug|>K(izSY zkO6u3NvzxWe2XP2|f`gJE_%GoKyFpsXSXR zG>b2+u*W-}2%p!PCRW(xoXt+ZXWpL{!J>wKeYxto&E7loMynXn1D+-59_X z-|q3aF=X&nx%E4{AEVe_UdfFd@*Jf7MH=mH(w1*wIVSn9&=Cs1g$>(eE|ltk4khuK zXnI2tp_)7*OZabnqMg@ zKdv$UhS!PChF6`T?1%eC;(UN+!oxoi>r7Qm;)Uf#_MeGlwrx8Ev!Rqac|{Jz%FcBO zj=V9-N8;;)Q1sDtf$AL*Tz;ZKKAmskK+l?+W6=t5dG*E2;UQGAG)Ia1cfg?_d2$|D zR!jOjaM)@vf@voN0S|{J@t}gFMJH)7!%yV9Ot;YNY*@J>JssX0_#vo^K8SACy)1@G zvOVPD4Ws^n_gwDx$AesGH~R%sEo zXp^OI%=nM33xi+$VR@{~Z9H47UlI2N5P);ODE;2`ir3x-!_wo8ulrSnsc)hVC*Voz zjV^cKS;}-*6fXPJsy56wnNDSRue)P#f~$QgOJ!_4fi*;E1GRwI9za8#$i~OlNeOzY zey{@N7{J-+vx&n8&R0Zz9&o=QO1Nsz+KQKHS-W?yG=X9}8q5Y-I^3LX=-8wklSpB; ze3`Nmh6pozwM1SnV)|Dyu3E(ml9ncx_W?Y*%%l?Bc^zgU+WP&qR4PanQ56sJJej93 zB(7ek8-5in+d+cV#2gPe4$4NCimVXT?>ML&J7g@8jJ_*vj2p*8w9FA-u^M<%$9W?B zai;4lbW*^{I2s^tL?iX*>PmKttY+2o#VCDgqu{;8NYEymISEa9@j%ZLuvvPwfwpy=HZpmf=8g?9<v z^4E6U#R^#eVgl6w`8WkdUgk4`2yhAZk$^b`Wse!t%O#ml5yXQPHZ^xs(09K(D$^TZ zVQ-%I7W^mT#M-7pUyG$s&Aa(;yQfEtpl&Xr=$xT93v2zsg8nURjE9p~9u%~jnlO}k zIBg;zlk}TaPHXEXJftu2G=_;G}b@M}$p5@thZbLY<&tn?XybZE@ zKJQ#0-&Hf!z02AFn0>k-odBWv^8-=W!Qk=h$%Y)fe`dDjnj%YCyXZ{(8AayWx5zvF zoGk2`8ccwz`&kcPeIm5^iDnMW-C6;jm6d!;p)!jM7^I(xt;xkJSay4q{QOTpW1s0vBqtsMSi)>OFs-}XM`1uTl(2dDwD-9*!MJ1x39IRG0^y)C z?V+%(PEAtnePixViRU|Tr`GG?Epm)GpLSZ`uW$5e7#yfvl9q(VOwR9l?gK@sCAB%mrDCh+0 z&40=dyW!I|tZ|UTt1%{(Vwr!xWaP5CP+%e-%cj^;+*VBkvRv9+7^_*!xD7Vlj0qSa zfwcu77T0j1j2H_W1NfQi)c_A5s4`K z3=$A(Y9?T#mFRES{Ii6|u1CVxWfi`cKJJ>sF^X)8*_b1RO|Gx*(Ieo&gCuF95y>=` zRx}98UqALN5=#cHumAcB79O0_B?ZE`Ag0&Yb#lOZlLBu6)|oPUCS}SnjW#PuKT1cA z*lTaBK=}58x}w2(>mNcH2(X5uZA06<8cTYg%0bG;v#pCg;UyBnUm%*|N5ZYW$s2|N zOydqm()b=_yo7+(%`Akp$>RxNsIEvnqEg%|XMCm~LhEeNVUHP~z{R;bLIs!Iz=Alw z?Z|c)Q2UK=k0Al(n#bJ&8vZ-&Pv&%5GGT$6iJD)DQ3ngJ2^=Fl|C9>08U~|h>2Z&I z^jGc&7hj}FT8Y#wjUWX;l}cn%D=KWg9K@@jsdscmT8?^ z<$ROJ8Y&){yvo`w!CFoK$Ucbz8Bk^n1QaN5E5`brXyN|H!^eY9V&eDqFf3cU%xr-> zk7TGp)|9=t&#H{Bg}UKv-^cUiOb)U5`T8m_lFT^`pBStZ zj>S*X0i(K0yDDo$Z;`ggV@0Z{t^axtY`34i2i1rZPr4odz=w9{)?BF_AJ!QFY`R77 zYiP>gH;S2=hG-b-P4fmKJ(yA(e5{B`UxKFYPpLjpJ$2>;6NAM^AKBwkOFAz+!o?!u zHw*WWCB6KWP-H9I+>uCx^7ulNhA8qe8%8*}nJ=)Gpn^F)zjqy3eP0T)0`YL;(n};( zl4A&P$VG_v%h`XK@rO~*58Qa2<(WSeH?c%-Hr$SYy3K)Um914Srb`6QER0BH-_OfR4Y=6VCK)5&ndg%Lb&r=jx%z35D z`{@69}aaSH`e@Lm+++ zbd1GQ*;zla*JTQf%WRk~_lAGK7$kv!XkfQIXULILK+4n>%MJH}LYkH1OdvoQW-AlK z?z3ImBXx&&%g70y0Q+j?Z2QbMIL}MKx`E-e^}S8$$8jzAJEGIWPqdCWDNJw$rXmC&33xG`+QlSFvT1xvoNGiLADo~R z@P?7MnYNo!%wnl~h1OGpIZy=uwW0*k05g5YlJ;ZKkIKt&=q*O6KMkHL#S}FJVpO21 zbT}MukolAd9XOG~%tVlkWZG<^5Yks?3h_6E4L}rA^tHE|+@B+{c^JE~%$-A2sgM&u zDe61$OP9;b2HYlZm6^9hgRP9kO0~vN=Z7Om#;Q$2R$;l5E3NdWI#&DY&v1@nji63Y zZJ|!czptT= z_AlVf#iP!mM;I&Nk~hcm2oS#^{5XRr&XQBX+amJ3^1Z+Ceo)_RxwHZqKq8xOqH^Pk zFZFwpQ%!TrhN!_~uidt>Qx190{jw&I?%R$QG}`lTo5yT3&ip%qa}8B-_W)2f+a-moIJ2oy_H>wRDO z(zo{e?Kv}+S!TaIue1BpVeFpfoeq>J$1GbWLC#r&Vt6HI%eOOUh5 z(4=LyS{D%-jp7GgYf84&ad2v}A9zz@cK91MDi|$i&;2H6Ja@^Y@0n^fNG1=h$q`*T z3IuCjDR*S>*m6G>EV8n3uRa~b0b+uT;AS;gI;b=zo|gmp!qsE{AQ|EtgHzpzjV67u z8XoCv^;CXpm^r$W&A-i}SErZGONzmZEj9F3{^=>I#3VdpaiT{EC+?mf#-3vZkPIe= zo1^f*l9Ksr&5U8L5L=ecyDPEETFPw(dtxB2vg0p?X<(}1*zDFpgqt~Mf;u>VAdm(` zN`Ca2#VUP>0hYxC#1L7GUEXjsaivWo@Qu&vE^+)-2eg9j_y~FH->~x5ZWrCO2&H z6;sRLA&Y+_i3ZG_s(@#62*y^jj*~0r0MCVsKi3RDw&Hb_Es#yq#EZXtQM~Vi{eBwy z?`+!HI;|uwZOSOP@G{biA}KWR`Mu^tu+8|iy;l3{1y8Nlwe@KR=WOGa+bv|pHg%;7 zzMQ}Ze@FMuE1^M1$+CO}kcu#j>@_ab#?lvt#njvp#SFjhg4VNU3H6El|V|4lx z)JCPbdEaoxqD+FG7v7)W!535>xtG*?EtL75{%S)Hzi7UQcSKPTX9&^{D;vzaO10(q zRmrWN@Vy;$U#ZotKOTJSq_pR7D`2eMb2p4RdTTcLX2HnjnA0G4#?iXRtbtz2rEeG6t!MotZ*n0;~;2%bqa!c6Pw>akbmj- zV2%F1-6OUfi*MNxGe2w!3+Vjg`Rzz@vb%8C!wq7X7f^uohvS3y`29Odxcxd=Qf|L$ z>(4J6A9hdOZ68ia^uAQxWGEG#nTP;n*d%0FWz#i2W<1P}$l)kdiN-7hlTfkRpVWdO zK52Rc;7k(&h+O9pe5+Z(xs0ddO@M@(AmWdy7D`j)wVk1gICe(a4F zrmB5xK~1Y{In$vR(<5XmZ4~FW$EJG$`}7(0tm$yDvG{QI*ZhXBveKd%5sbkV=| zW9~!{_9S+E&%qykRKdxY=6QYzhT(HRjBC}nLQ&;#x5}ojwSPjKCCAU3|1Ej+4Nm9? z76}f!%&O6!POo68wHD6Uq^LBTy(-`V!*w`)QOZWZoR+UWnDVC@%hIbR)X+q&ptOMh zwkQNo>q0UEJ0i!sCnNs{n*np~kKEhjE51p1HZ$tS_uHE1>9@~r(zXk(%vl9q4dNUM z|Fga0!R@(TU)GbVKi9Ox*(X~V>GVj@-^kU z8{D))A=Wpv=_w~s95DwnFQAeGVaVke7E5&i?A+I47!(CheU>P(#KrfK0NSDF25Syg z>~;$w{c-!q{&X{pvw`Xcf^H$pFMXWeTp+JL9KIcco$ttYLouU)a&MBpBphB_N`Js= z{gKCk0#H`TREiSZ)_<65htbvF6p4GfW{+KET0P9*zQKHN_n5-rQ4r8o?4K&2OMUIR z6P3?{Y``@Xc3bh{1U!Y~?EdR*3ELoniS0aa6i06FmBtip+o1jw7^!qdwD z#(rgD^N`WiaYDxS*n-+)IH3=^OVXd_bx2vZeVl*KB9#oxP|u4)XPcYF@r8lYwnA;h zZhz0&SKo$Wb$+(%A=$K}UG6p(v(YLh`gnF}6`xTmUJ7uD0j(n$`yDo6r^cP&-`Q_j zw_fmfsda+rat^jP{WJ5A+&oK1FJ4P)_CCgRh54#K00 zzV(GJbsC`Tg`$lqti;*KELi=f5zFaaO@A=JaFtI7+*e*T&2>3E7r>wXU49b=NqeEf zk+evPHIGYAxr3 z&3rcWJOa>tUCj1&1!DRK;iamVgk66T_87rt4T?_HpVnD93d$`V)*6gFNJ!^E(!9x7 zYToKN?(83|d(ZEW;BmXsMucMoX7uq6iI;Xom9BGUC032RRpxu-)W=aF)%pI~CV1ud zyI)ii*Gt-H9@l*X^Zyp1x+oEuEW;R$R^V~N!renOHfjipCDDGw!i4cyOeeoDGsp`~ zVcRirZ+8n51c^VeUtgquAb$^rG}GcaP&D~l#5{v@)mPw&D+;-XX>Y#%HQH`WanIOT zbcDDVqcZr|xI<+%*q^E43(2$ox{g3jTfYt&F#BWu#P@l3;r-q{^8?D5o~!64_CUsO z?45Ni-*3Q;*NQAhmm<$?-;9qIWKc5m+M-SFwKn%4uE)$aAm>DLY}u{d1+>aIc@?nk zPw6WpH#(%2mA@SY?mJ+EwwS|Tr#1Yu4wS~Hys@OB8M}$>=Ep|fgXY|xZ?OF1t`c%K znjD&yEbI1jdmPjm-jx`d_38&xQ)N%I3*mNo#sx?AK@Z zyV-$E8$WmcDnRrE+Q)W~?%SlLW;oEM-$o^b@OBH51(2arRDxF=3*XtKly1;fP2Cwd zEsBV~47-$vK*HsRn2@7w@VdYO?(GpwKlqqsaY_lpLKI!=o2&vZKn-Ioq37i3MW-qR zi?0ma@9yH`5vZ6@cWSz?Qr5-~{Xr1W2M}{M!w>?PrmYvV>0Q?heatJ2Jn{BHp*Q&$ zQ(D=h8dnx$#f;t84z*7#x!@Q!IeQb{9sQ@gP|+`Rco*DJE*7Lb=7ctPwV)~uX3Sdg8fK@)#+@e8tU3VF!Zm&m1tTv9CsB<+wvn4HtbkAyE z7|bt%dZCtTi61w=StCH=9#iROinJC49n$i&IRJ3ka2RQDl~a%{%}s)uZZkT=34dDS z9K$#`S&S3TqiNBIODsvWVwE^sW_hQIDP*frIo5W#mS~kDbv%XA$(=8D?F9GaxG7$3 z?x2)Vi(c%&O>4&k61mzrOSwMz1M5MUCSR?$1MfkXY*mO_qaSUS*FQ&#o0Clq7lK=`C?gMa3aI$7JhEtkp)yK9Bl&2Wq=L^t8_I!HT7<0Txdt#;WPzW$+B0$;6C)- zdtV}Z4^k(T!x}|f7m2SKG=ohreYFo?R!cMW-2})qkQ`FBPGkdXz7&_>3+I7u_9KK) zHkP>SYy|u@su^exotjRMtcYq|@2cO6zk{y(aA|2M;Q8j`H96}bd4oWo-}x~qoSFT& z0Pkub0$!@d3;yJ9_!rA^VFXPad=DB<8HZq{>x3x!JBK{Rh{_T`KwgY+>57mJ=9vq(kT_3;# zk|N4mWA0exsW~p{U4u^&IDHgdl(`-)o|Rg9YGXGO9@^R}UwDMR^Q3%!I(8j$!-6w) z418uIzMI(Htk0qWHKfQA5JQff9aD95O^7dZ4Cjwi{5V#`g~jT}VEipTpg4rXzA8>Y zqgZ0lF?w@mw{{iH{r>#Z?rGba{xD9#Nq|>_x)XLQb)@I4mO|UcXj_7gj7O?wP2A@# z&Fm)MLYj6=l*oQp#{BO>pVBHu&hoxU8(kgv%on@yRyiLa_rOwF*hWIL(&^@OXaojP zk$B1wT@05YgUH{Qb;V&8(QaOxV)_X+>Rc zUyOt96b@zj)z+R&OiNFq>nf`J3Os6lwssxTLYT5QV5aya4O1w?*rh<3G<6t7^-F(W zu0Tn++9;YlX2~FfQ028`)q2PswMCUrSez2|SMsaJzAP-$Td8i%m6z}}Jo2Nt-LEQ) zx#z7Ow_gf2eXqYOoN9D@Gl-|aJ7eMgV#yC@i)gQG(86c}p*#N6hGh10RLxZ{_uJMNSCl!tA#s%u-r@mHU{FkFU+ z%{T~u&v&lpm3b$Bx?e}-Bl4hLEsI#vdT=EUuN=>bRGdl-Jo*;=EoV2^f1 zcs7FyOgVfP&QQn!L$q{L7NZygX)W(c%Ok4b0N2zdAC{X66!4z@%~X?O35O25|Er=m zs?k02I*;VPn66gb4RBwr5*?EH)Xgy)E(BOJ;|+hU%MiS?+J(irKG9|Ma$saCpM?46 z7Qa7+mbUP4WG5@1yD)D}DqXRhw9>w+?%=XCgaB)pLj#R@>(#WQdPB%?d2?PuChHH* zI31hJYrDlzl+Ip)N7&9KntvN;6awQ|lgbal=s=%!_Fo+<&P{q)Nm5SGtrUDPgrx>; zuWE$$vWZ-J*4Msz5Tw@D!5}w-<5^ZNs@0L&ss)sj$cC?3MLjXXSEs>o5fomqM|ciD zHKB=Ycl(=gNGv!8`(2X$!p~Y4yJ1LVEDDi5owI&yv7=qIdoNEB6@DQOdQ_)ACg!&T q*_M2U>=5@3ktSAgKb__A2P7@*4Bhb{b?tw@9Z8DHic|~f2mT)vgJvZF literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_fault_reason.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_fault_reason.xml index 53b4bc3c6d..8dbc30dff8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_fault_reason.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_fault_reason.xml @@ -266,7 +266,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/report_button_bg" - android:text="@string/take_over_report" + android:text="@string/fault_report" android:textColor="#FFFFFF" android:textSize="@dimen/sp_27" android:textStyle="bold" diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_report_type.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_report_type.xml index 52fcdf265a..de8a514a7a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_report_type.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_report_type.xml @@ -111,7 +111,7 @@ android:textSize="@dimen/sp_26" android:textColor="@color/white" app:drawableTopCompat="@drawable/icon_report_success" - android:layout_marginTop="@dimen/dp_59" + android:layout_marginTop="@dimen/dp_79" android:drawablePadding="@dimen/dp_22" android:visibility="gone" /> diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml index f0ca7f315f..69a1186274 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_take_over_reason.xml @@ -207,7 +207,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/report_button_bg" - android:text="@string/take_over_report" + android:text="@string/take_over_save" android:textColor="#FFFFFF" android:textSize="@dimen/sp_27" android:textStyle="bold" 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 b5db31cebe..753b31b553 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 @@ -92,6 +92,30 @@ android:gravity="center" /> + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml index 15a42e6840..8a3a241e52 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml @@ -61,7 +61,9 @@ （选填） 手动输入 补充描述语音输入 - 上报 + 上报 + 保存 取消 + 暂无接管记录 \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt index 36e1e015c3..3a00f45dd3 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt @@ -58,7 +58,7 @@ interface IMoGoDevaToolsListener { fun problemPadAddSuccess(){} - fun problemPadAddError(){} + fun problemPadAddError(msg: String){} fun getCategoriesSuccess(list: List){} diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt index d500af0ab2..d777e4f4a6 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsListenerManager.kt @@ -92,10 +92,10 @@ object CallerDevaToolsListenerManager : CallerBase() { /** * 上报故障到运营平台失败 */ - fun invokeProblemPadAddError(){ + fun invokeProblemPadAddError(msg: String){ M_LISTENERS.forEach{ val listener = it.value - listener.problemPadAddError() + listener.problemPadAddError(msg) } }