diff --git a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt index 535729f..95243bb 100644 --- a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt +++ b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt @@ -92,9 +92,9 @@ abstract fun onDataReceived(buffer: ByteArray?, size: Int) override fun onDestroy() { + super.onDestroy() readThread?.interrupt() BaseApplication.get().closeSerialPort() serialPort = null - super.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt index 535729f..95243bb 100644 --- a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt +++ b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt @@ -92,9 +92,9 @@ abstract fun onDataReceived(buffer: ByteArray?, size: Int) override fun onDestroy() { + super.onDestroy() readThread?.interrupt() BaseApplication.get().closeSerialPort() serialPort = null - super.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt index e25512a..e419d63 100644 --- a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.app.DatePickerDialog import android.content.Context +import android.content.DialogInterface import android.content.Intent import android.media.AudioAttributes import android.media.SoundPool @@ -100,6 +101,7 @@ leftBackView.setOnClickListener { finish() } /**************************************************************************************/ + //TODO Spinner需要优化 objectTypeSpinner.show(this, LocaleConstant.POINT_TYPE_ARRAY, 0, object : OnItemSelectedListener { override fun defaultSelection(default: String) { @@ -156,15 +158,33 @@ }) constructDateView.setOnClickListener { - val year = calendar.get(Calendar.YEAR) - val month = calendar.get(Calendar.MONTH) + 1 - val day = calendar.get(Calendar.DAY_OF_MONTH) - val datePicker = DatePickerDialog(this, { _, y, m, d -> - constructDateView.text = String.format( - "%s-%s-%s", y, m.appendZero(), d.appendZero() - ) - }, year, month, day) + val datePicker = DatePickerDialog( + this, + null, + calendar.get(Calendar.YEAR), + calendar.get(Calendar.MONTH), + calendar.get(Calendar.DAY_OF_MONTH) + ) datePicker.show() + + datePicker.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { + val year = datePicker.datePicker.year + val month = datePicker.datePicker.month + 1 + val day = datePicker.datePicker.dayOfMonth + val selectedDate = String.format( + "%s-%s-%s", year, month.appendZero(), day.appendZero() + ) + + //当前时间 + val current = System.currentTimeMillis().timestampToTime() + val today = "$selectedDate $current".dateToTimestamp() + if (Date(today).after(Date())) { + "建设年代不能早于当前日期".show(context) + } else { + datePicker.dismiss() + constructDateView.text = selectedDate + } + } } identifierTypeSpinner.show(this, LocaleConstant.IDENTIFIER_TYPE_ARRAY, 0, diff --git a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt index 535729f..95243bb 100644 --- a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt +++ b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt @@ -92,9 +92,9 @@ abstract fun onDataReceived(buffer: ByteArray?, size: Int) override fun onDestroy() { + super.onDestroy() readThread?.interrupt() BaseApplication.get().closeSerialPort() serialPort = null - super.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt index e25512a..e419d63 100644 --- a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.app.DatePickerDialog import android.content.Context +import android.content.DialogInterface import android.content.Intent import android.media.AudioAttributes import android.media.SoundPool @@ -100,6 +101,7 @@ leftBackView.setOnClickListener { finish() } /**************************************************************************************/ + //TODO Spinner需要优化 objectTypeSpinner.show(this, LocaleConstant.POINT_TYPE_ARRAY, 0, object : OnItemSelectedListener { override fun defaultSelection(default: String) { @@ -156,15 +158,33 @@ }) constructDateView.setOnClickListener { - val year = calendar.get(Calendar.YEAR) - val month = calendar.get(Calendar.MONTH) + 1 - val day = calendar.get(Calendar.DAY_OF_MONTH) - val datePicker = DatePickerDialog(this, { _, y, m, d -> - constructDateView.text = String.format( - "%s-%s-%s", y, m.appendZero(), d.appendZero() - ) - }, year, month, day) + val datePicker = DatePickerDialog( + this, + null, + calendar.get(Calendar.YEAR), + calendar.get(Calendar.MONTH), + calendar.get(Calendar.DAY_OF_MONTH) + ) datePicker.show() + + datePicker.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { + val year = datePicker.datePicker.year + val month = datePicker.datePicker.month + 1 + val day = datePicker.datePicker.dayOfMonth + val selectedDate = String.format( + "%s-%s-%s", year, month.appendZero(), day.appendZero() + ) + + //当前时间 + val current = System.currentTimeMillis().timestampToTime() + val today = "$selectedDate $current".dateToTimestamp() + if (Date(today).after(Date())) { + "建设年代不能早于当前日期".show(context) + } else { + datePicker.dismiss() + constructDateView.text = selectedDate + } + } } identifierTypeSpinner.show(this, LocaleConstant.IDENTIFIER_TYPE_ARRAY, 0, diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index 00e58d0..dec4e1a 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -136,8 +136,7 @@ val downloadUrl = companyId.toString().appendDownloadUrl(FileType.EXCEL) Log.d(kTag, "downloadUrl => $downloadUrl") downloadUrl.downloadFile( - createDownloadFileDir().toString(), - object : OnDownloadListener { + createDownloadFileDir().toString(), object : OnDownloadListener { override fun onDownloadEnd(file: File?) { CoroutineScope(Dispatchers.Main).launch { labelBeans = ExcelHub.read(file?.absolutePath) @@ -190,7 +189,7 @@ SamplePopupWindow.OnPopupWindowClickListener { override fun onPopupItemClicked(position: Int) { when (position) { - 0 -> updateTaskData() + 0 -> updateLabels() 1 -> downloadTask() 2 -> versionViewModel.getApplicationVersion() 3 -> uploadEvent() @@ -535,7 +534,7 @@ } //更新数据 - private fun updateTaskData() { + private fun updateLabels() { AlertControlDialog.Builder() .setContext(this) .setTitle("提示") diff --git a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt index 535729f..95243bb 100644 --- a/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt +++ b/app/src/main/java/com/casic/detector/base/SerialPortActivity.kt @@ -92,9 +92,9 @@ abstract fun onDataReceived(buffer: ByteArray?, size: Int) override fun onDestroy() { + super.onDestroy() readThread?.interrupt() BaseApplication.get().closeSerialPort() serialPort = null - super.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt index e25512a..e419d63 100644 --- a/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/InstallLabelActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.app.DatePickerDialog import android.content.Context +import android.content.DialogInterface import android.content.Intent import android.media.AudioAttributes import android.media.SoundPool @@ -100,6 +101,7 @@ leftBackView.setOnClickListener { finish() } /**************************************************************************************/ + //TODO Spinner需要优化 objectTypeSpinner.show(this, LocaleConstant.POINT_TYPE_ARRAY, 0, object : OnItemSelectedListener { override fun defaultSelection(default: String) { @@ -156,15 +158,33 @@ }) constructDateView.setOnClickListener { - val year = calendar.get(Calendar.YEAR) - val month = calendar.get(Calendar.MONTH) + 1 - val day = calendar.get(Calendar.DAY_OF_MONTH) - val datePicker = DatePickerDialog(this, { _, y, m, d -> - constructDateView.text = String.format( - "%s-%s-%s", y, m.appendZero(), d.appendZero() - ) - }, year, month, day) + val datePicker = DatePickerDialog( + this, + null, + calendar.get(Calendar.YEAR), + calendar.get(Calendar.MONTH), + calendar.get(Calendar.DAY_OF_MONTH) + ) datePicker.show() + + datePicker.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { + val year = datePicker.datePicker.year + val month = datePicker.datePicker.month + 1 + val day = datePicker.datePicker.dayOfMonth + val selectedDate = String.format( + "%s-%s-%s", year, month.appendZero(), day.appendZero() + ) + + //当前时间 + val current = System.currentTimeMillis().timestampToTime() + val today = "$selectedDate $current".dateToTimestamp() + if (Date(today).after(Date())) { + "建设年代不能早于当前日期".show(context) + } else { + datePicker.dismiss() + constructDateView.text = selectedDate + } + } } identifierTypeSpinner.show(this, LocaleConstant.IDENTIFIER_TYPE_ARRAY, 0, diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index 00e58d0..dec4e1a 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -136,8 +136,7 @@ val downloadUrl = companyId.toString().appendDownloadUrl(FileType.EXCEL) Log.d(kTag, "downloadUrl => $downloadUrl") downloadUrl.downloadFile( - createDownloadFileDir().toString(), - object : OnDownloadListener { + createDownloadFileDir().toString(), object : OnDownloadListener { override fun onDownloadEnd(file: File?) { CoroutineScope(Dispatchers.Main).launch { labelBeans = ExcelHub.read(file?.absolutePath) @@ -190,7 +189,7 @@ SamplePopupWindow.OnPopupWindowClickListener { override fun onPopupItemClicked(position: Int) { when (position) { - 0 -> updateTaskData() + 0 -> updateLabels() 1 -> downloadTask() 2 -> versionViewModel.getApplicationVersion() 3 -> uploadEvent() @@ -535,7 +534,7 @@ } //更新数据 - private fun updateTaskData() { + private fun updateLabels() { AlertControlDialog.Builder() .setContext(this) .setTitle("提示") diff --git a/app/src/main/res/layout/include_install_label_identifier.xml b/app/src/main/res/layout/include_install_label_identifier.xml index 554b290..5efa0d7 100644 --- a/app/src/main/res/layout/include_install_label_identifier.xml +++ b/app/src/main/res/layout/include_install_label_identifier.xml @@ -41,7 +41,7 @@ android:id="@+id/identifierIdView" style="@style/inputEditTextStyle" android:gravity="center_vertical" - android:textColor="@color/hintColor" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> - constructDateView.text = String.format( - "%s-%s-%s", y, m.appendZero(), d.appendZero() - ) - }, year, month, day) + val datePicker = DatePickerDialog( + this, + null, + calendar.get(Calendar.YEAR), + calendar.get(Calendar.MONTH), + calendar.get(Calendar.DAY_OF_MONTH) + ) datePicker.show() + + datePicker.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { + val year = datePicker.datePicker.year + val month = datePicker.datePicker.month + 1 + val day = datePicker.datePicker.dayOfMonth + val selectedDate = String.format( + "%s-%s-%s", year, month.appendZero(), day.appendZero() + ) + + //当前时间 + val current = System.currentTimeMillis().timestampToTime() + val today = "$selectedDate $current".dateToTimestamp() + if (Date(today).after(Date())) { + "建设年代不能早于当前日期".show(context) + } else { + datePicker.dismiss() + constructDateView.text = selectedDate + } + } } identifierTypeSpinner.show(this, LocaleConstant.IDENTIFIER_TYPE_ARRAY, 0, diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index 00e58d0..dec4e1a 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -136,8 +136,7 @@ val downloadUrl = companyId.toString().appendDownloadUrl(FileType.EXCEL) Log.d(kTag, "downloadUrl => $downloadUrl") downloadUrl.downloadFile( - createDownloadFileDir().toString(), - object : OnDownloadListener { + createDownloadFileDir().toString(), object : OnDownloadListener { override fun onDownloadEnd(file: File?) { CoroutineScope(Dispatchers.Main).launch { labelBeans = ExcelHub.read(file?.absolutePath) @@ -190,7 +189,7 @@ SamplePopupWindow.OnPopupWindowClickListener { override fun onPopupItemClicked(position: Int) { when (position) { - 0 -> updateTaskData() + 0 -> updateLabels() 1 -> downloadTask() 2 -> versionViewModel.getApplicationVersion() 3 -> uploadEvent() @@ -535,7 +534,7 @@ } //更新数据 - private fun updateTaskData() { + private fun updateLabels() { AlertControlDialog.Builder() .setContext(this) .setTitle("提示") diff --git a/app/src/main/res/layout/include_install_label_identifier.xml b/app/src/main/res/layout/include_install_label_identifier.xml index 554b290..5efa0d7 100644 --- a/app/src/main/res/layout/include_install_label_identifier.xml +++ b/app/src/main/res/layout/include_install_label_identifier.xml @@ -41,7 +41,7 @@ android:id="@+id/identifierIdView" style="@style/inputEditTextStyle" android:gravity="center_vertical" - android:textColor="@color/hintColor" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:hint="请选择" + android:textColor="@color/black" + android:textColorHint="@color/hintColor" /> - constructDateView.text = String.format( - "%s-%s-%s", y, m.appendZero(), d.appendZero() - ) - }, year, month, day) + val datePicker = DatePickerDialog( + this, + null, + calendar.get(Calendar.YEAR), + calendar.get(Calendar.MONTH), + calendar.get(Calendar.DAY_OF_MONTH) + ) datePicker.show() + + datePicker.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { + val year = datePicker.datePicker.year + val month = datePicker.datePicker.month + 1 + val day = datePicker.datePicker.dayOfMonth + val selectedDate = String.format( + "%s-%s-%s", year, month.appendZero(), day.appendZero() + ) + + //当前时间 + val current = System.currentTimeMillis().timestampToTime() + val today = "$selectedDate $current".dateToTimestamp() + if (Date(today).after(Date())) { + "建设年代不能早于当前日期".show(context) + } else { + datePicker.dismiss() + constructDateView.text = selectedDate + } + } } identifierTypeSpinner.show(this, LocaleConstant.IDENTIFIER_TYPE_ARRAY, 0, diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index 00e58d0..dec4e1a 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -136,8 +136,7 @@ val downloadUrl = companyId.toString().appendDownloadUrl(FileType.EXCEL) Log.d(kTag, "downloadUrl => $downloadUrl") downloadUrl.downloadFile( - createDownloadFileDir().toString(), - object : OnDownloadListener { + createDownloadFileDir().toString(), object : OnDownloadListener { override fun onDownloadEnd(file: File?) { CoroutineScope(Dispatchers.Main).launch { labelBeans = ExcelHub.read(file?.absolutePath) @@ -190,7 +189,7 @@ SamplePopupWindow.OnPopupWindowClickListener { override fun onPopupItemClicked(position: Int) { when (position) { - 0 -> updateTaskData() + 0 -> updateLabels() 1 -> downloadTask() 2 -> versionViewModel.getApplicationVersion() 3 -> uploadEvent() @@ -535,7 +534,7 @@ } //更新数据 - private fun updateTaskData() { + private fun updateLabels() { AlertControlDialog.Builder() .setContext(this) .setTitle("提示") diff --git a/app/src/main/res/layout/include_install_label_identifier.xml b/app/src/main/res/layout/include_install_label_identifier.xml index 554b290..5efa0d7 100644 --- a/app/src/main/res/layout/include_install_label_identifier.xml +++ b/app/src/main/res/layout/include_install_label_identifier.xml @@ -41,7 +41,7 @@ android:id="@+id/identifierIdView" style="@style/inputEditTextStyle" android:gravity="center_vertical" - android:textColor="@color/hintColor" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:textColor="@color/black" /> + android:hint="请选择" + android:textColor="@color/black" + android:textColorHint="@color/hintColor" />