From 09037cdeb911b827c2fdabfeedaa8d0f6836b87b Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 22 Apr 2024 14:10:28 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0]=E5=B7=A5=E5=8D=95=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BE=93=E5=85=A5=E6=A1=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workorder/WorkOrderWindow.kt | 15 +++++++++++---- .../src/main/res/layout/view_work_order.xml | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt index 2a62a89edc..612dba4559 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderWindow.kt @@ -175,9 +175,6 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, tvOccurrenceTime.text = millis2String(workOrderOccurrenceTime, TimeUtils.getHourMinFormat()) } etDescribeInput.requestFocus() -// val inputMethodManager = mActivity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager -// inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0) - etDescribeInput.addTextChangedListener(object: TextWatcher{ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { @@ -320,6 +317,7 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, /** * 显示结果 */ + @SuppressLint("SetTextI18n") private fun printResult(results: RecognizerResult) { val text: String = JsonParser.parseIatResult(results.resultString) var sn: String? = null @@ -338,7 +336,16 @@ class WorkOrderWindow constructor(activity: Activity) : View.OnTouchListener, Log.i(TAG, "语音内容=$resultBuffer") reasonDetail = resultBuffer.toString() if(reasonDetail.isNotEmpty()){ - etDescribeInput.setText(reasonDetail) + if(etDescribeInput.text.toString().isEmpty()){ + etDescribeInput.setText(reasonDetail) + etDescribeInput.setSelection(reasonDetail.length) + }else{ + val startStr = etDescribeInput.text.toString().substring(0,etDescribeInput.selectionStart) + val endStr = etDescribeInput.text.toString().substring(etDescribeInput.selectionEnd,etDescribeInput.text.toString().length) + etDescribeInput.setText(startStr+reasonDetail+endStr) + etDescribeInput.setSelection(startStr.length+reasonDetail.length) + } + } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml index 51f56b5532..be162310fa 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_work_order.xml @@ -217,9 +217,9 @@ android:gravity="top|start" android:paddingStart="@dimen/dp_28" android:paddingTop="@dimen/dp_33" + android:paddingEnd="@dimen/dp_80" android:layout_marginTop="@dimen/dp_30" android:background="@drawable/bg_work_order_des_input" - android:inputType="text" />