diff --git a/app/build.gradle b/app/build.gradle index bb8444e..16b9fb3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { minSdk 24 targetSdk 32 versionCode 1 - versionName "1.0" + versionName "1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/app-release.apk b/app/release/app-release.apk deleted file mode 100644 index 380cd07..0000000 Binary files a/app/release/app-release.apk and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json deleted file mode 100644 index d3e5748..0000000 --- a/app/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "com.navinfo.volvo", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "1.0", - "outputFile": "app-release.apk" - } - ], - "elementType": "File" -} \ No newline at end of file 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 5a7af02..50a88da 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 @@ -186,6 +186,10 @@ class ObtainMessageFragment : Fragment() { binding.edtSendTo.isEnabled=false binding.btnSendTime.isEnabled=false binding.btnObtainMessageConfirm.isEnabled=false + binding.tvPhotoName.isEnabled = false + binding.tvAudioName.isEnabled = false + binding.imgPhotoDelete.isEnabled = false + binding.imgAudioDelete.isEnabled = false } } @@ -493,30 +497,30 @@ class ObtainMessageFragment : Fragment() { ToastUtils.showToast(it.message) } - binding.tvAudioName.setOnClickListener { - binding.llAudioPlay.visibility = - if (binding.llAudioPlay.visibility == VISIBLE) GONE else VISIBLE - // 判断当前播放的文件是否在缓存文件夹内,如果不在首先下载该文件 - val fileUrl = obtainMessageViewModel.getMessageLiveData().value!!.mediaUrl!! - val localFile = - obtainMessageViewModel.getLocalFileFromNetUrl(fileUrl, AttachmentType.AUDIO) - if (!localFile.exists()) { - obtainMessageViewModel.downLoadFile(fileUrl, localFile, object : DownloadCallback { - override fun progress(progress: Int) { - } - - override fun error(throwable: Throwable) { - } - - override fun success(file: File) { - binding.voicePlayerView.setAudio(localFile.absolutePath) - } - - }) - } else { - binding.voicePlayerView.setAudio(localFile.absolutePath) - } - } +// binding.tvAudioName.setOnClickListener { +// binding.llAudioPlay.visibility = +// if (binding.llAudioPlay.visibility == VISIBLE) GONE else VISIBLE +// // 判断当前播放的文件是否在缓存文件夹内,如果不在首先下载该文件 +// val fileUrl = obtainMessageViewModel.getMessageLiveData().value!!.mediaUrl!! +// val localFile = +// obtainMessageViewModel.getLocalFileFromNetUrl(fileUrl, AttachmentType.AUDIO) +// if (!localFile.exists()) { +// obtainMessageViewModel.downLoadFile(fileUrl, localFile, object : DownloadCallback { +// override fun progress(progress: Int) { +// } +// +// override fun error(throwable: Throwable) { +// } +// +// override fun success(file: File) { +// binding.voicePlayerView.setAudio(localFile.absolutePath) +// } +// +// }) +// } else { +// binding.voicePlayerView.setAudio(localFile.absolutePath) +// } +// } binding.btnObtainMessageBack.setOnClickListener { findNavController().popBackStack() @@ -660,22 +664,22 @@ class ObtainMessageFragment : Fragment() { } } } - // 点击照片名称 - binding.tvPhotoName.setOnClickListener { - val viewData = ViewData() - viewData.imageSrc = obtainMessageViewModel.getMessageLiveData().value!!.imageUrl - viewData.targetX = Utils.dp2px(context, 10F).toFloat() - viewData.targetWidth = - DisplayUtils.getScreenWidthPixels(activity) - Utils.dp2px(context, 20F) - viewData.targetHeight = Utils.dp2px(context, 200F) - val viewDataList = listOf(viewData) - binding.imageViewer.overlayStatusBar(true) // ImageViewer 是否会占据 StatusBar 的空间 - .viewData(viewDataList) // 图片数据 - .imageLoader(PhotoLoader()) // 设置图片加载方式 - .showIndex(true) // 是否显示图片索引,默认为true - .watch(0) // 开启浏览 - - } +// // 点击照片名称 +// binding.tvPhotoName.setOnClickListener { +// val viewData = ViewData() +// viewData.imageSrc = obtainMessageViewModel.getMessageLiveData().value!!.imageUrl +// viewData.targetX = Utils.dp2px(context, 10F).toFloat() +// viewData.targetWidth = +// DisplayUtils.getScreenWidthPixels(activity) - Utils.dp2px(context, 20F) +// viewData.targetHeight = Utils.dp2px(context, 200F) +// val viewDataList = listOf(viewData) +// binding.imageViewer.overlayStatusBar(true) // ImageViewer 是否会占据 StatusBar 的空间 +// .viewData(viewDataList) // 图片数据 +// .imageLoader(PhotoLoader()) // 设置图片加载方式 +// .showIndex(true) // 是否显示图片索引,默认为true +// .watch(0) // 开启浏览 +// +// } binding.edtSendFrom.setText(obtainMessageViewModel.username) } diff --git a/app/src/main/res/layout/fragment_obtain_message.xml b/app/src/main/res/layout/fragment_obtain_message.xml index 6808b3c..e46cf06 100644 --- a/app/src/main/res/layout/fragment_obtain_message.xml +++ b/app/src/main/res/layout/fragment_obtain_message.xml @@ -409,7 +409,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="确认提交"> + android:text="修改保存"> \ No newline at end of file