diff --git a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt index 195792c..ef081f7 100644 --- a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt +++ b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt @@ -183,16 +183,19 @@ class ObtainMessageFragment : Fragment() { override fun onResume() { super.onResume() - if (obtainMessageViewModel.getMessageLiveData().value!=null&&Constant.message_status_send_over.equals((obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status)) { - binding.tvMessageTitle.isEnabled=false - binding.btnStartPhoto.isEnabled=false - binding.btnStartCamera.isEnabled=false - binding.btnStartRecord.isEnabled=false - binding.btnSelectSound.isEnabled=false - binding.edtSendFrom.isEnabled=false - binding.edtSendTo.isEnabled=false - binding.btnSendTime.isEnabled=false - binding.btnObtainMessageConfirm.isEnabled=false + if (obtainMessageViewModel.getMessageLiveData().value != null && Constant.message_status_send_over.equals( + (obtainMessageViewModel.getMessageLiveData().value as GreetingMessage).status + ) + ) { + binding.tvMessageTitle.isEnabled = false + binding.btnStartPhoto.isEnabled = false + binding.btnStartCamera.isEnabled = false + binding.btnStartRecord.isEnabled = false + binding.btnSelectSound.isEnabled = false + binding.edtSendFrom.isEnabled = false + binding.edtSendTo.isEnabled = false + binding.btnSendTime.isEnabled = false + binding.btnObtainMessageConfirm.isEnabled = false binding.tvPhotoName.isEnabled = false binding.tvAudioName.isEnabled = false binding.imgPhotoDelete.isEnabled = false @@ -675,10 +678,10 @@ class ObtainMessageFragment : Fragment() { binding.tvPhotoName.setOnClickListener { val viewData = ViewData() viewData.imageSrc = obtainMessageViewModel.getMessageLiveData().value!!.imageUrl - viewData.targetX = Utils.dp2px(context, 10F).toFloat() + viewData.targetX = Utils.dp2px(requireContext(), 10F).toFloat() viewData.targetWidth = - DisplayUtils.getScreenWidthPixels(activity) - Utils.dp2px(context, 20F) - viewData.targetHeight = Utils.dp2px(context, 200F) + DisplayUtils.getScreenWidthPixels(requireActivity()) - Utils.dp2px(requireContext(), 20F) + viewData.targetHeight = Utils.dp2px(requireContext(), 200F) val viewDataList = listOf(viewData) binding.imageViewer.overlayStatusBar(true) // ImageViewer 是否会占据 StatusBar 的空间 .viewData(viewDataList) // 图片数据 diff --git a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageViewModel.kt b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageViewModel.kt index a9b93e2..052c21f 100644 --- a/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageViewModel.kt +++ b/app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageViewModel.kt @@ -32,6 +32,7 @@ class ObtainMessageViewModel @Inject constructor( private val pre: PreferencesRepository, ) : ViewModel() { var username = "" + init { viewModelScope.launch { pre.loginUser().collectLatest { @@ -47,6 +48,7 @@ class ObtainMessageViewModel @Inject constructor( fun setCurrentMessage(msg: GreetingMessage) { + msgLiveData.value = msg msgLiveData.postValue(msg) } diff --git a/app/src/main/res/layout/fragment_obtain_message.xml b/app/src/main/res/layout/fragment_obtain_message.xml index b7d9f3a..1cce4c1 100644 --- a/app/src/main/res/layout/fragment_obtain_message.xml +++ b/app/src/main/res/layout/fragment_obtain_message.xml @@ -1,19 +1,20 @@ - + + android:scrollbars="none" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent"> + @@ -24,10 +25,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/default_widget_padding" + android:hint="问候信息" app:counterEnabled="true" app:counterMaxLength="10" app:errorEnabled="true" - android:hint="问候信息" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -42,9 +43,9 @@ + android:layout_height="wrap_content" + app:layout_constraintTop_toBottomOf="@id/ti_layout_title" /> + + + app:icon="@drawable/ic_baseline_camera_24"> + + + app:icon="@drawable/ic_baseline_image_search_24"> + + android:orientation="horizontal" + android:visibility="gone"> + + android:layout_weight="1" + android:padding="@dimen/default_widget_padding" + android:textColor="@android:color/holo_blue_dark"> + + - + android:scaleType="fitCenter"> + + + app:icon="@drawable/ic_baseline_fiber_manual_record_24"> + + + app:icon="@drawable/ic_baseline_audio_file_24"> + android:orientation="horizontal" + android:visibility="gone"> + + android:padding="@dimen/default_widget_padding" + android:text="" + android:textColor="@android:color/holo_blue_dark"> + + + android:orientation="horizontal" + android:visibility="gone"> @@ -283,11 +298,11 @@ android:text="我是谁:"> + android:background="@drawable/selector_bg_4_round_corner" + android:enabled="false"> - + android:layout_height="wrap_content" + app:layout_constraintTop_toBottomOf="@id/ti_layout_title" /> + app:icon="@drawable/ic_baseline_access_time_24"> + + android:layout_height="wrap_content" + app:layout_constraintTop_toBottomOf="@id/ti_layout_title" /> + + \ No newline at end of file