From 44c76eb00dc977be1c097c11e538e6ab54ec3864 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 27 Feb 2024 16:05:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=AA=E4=BA=BA=E8=B5=84?= =?UTF-8?q?=E6=96=99-=E5=A3=B0=E9=9F=B3=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/activity/UserInfoModifyActivity.kt | 60 -------------- .../res/layout/activity_user_info_modify.xml | 83 ------------------- 2 files changed, 143 deletions(-) diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt index 0e2fe836d..2fbfc04e8 100644 --- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt @@ -4,21 +4,15 @@ import android.Manifest import android.annotation.SuppressLint import android.content.Intent import android.graphics.Bitmap -import android.graphics.Color import android.net.Uri import android.os.Build import android.os.Bundle import android.provider.Settings import android.text.TextUtils -import android.view.MotionEvent import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener import com.fourmob.datetimepicker.date.DatePickerDialog -import com.google.android.flexbox.AlignItems -import com.google.android.flexbox.FlexDirection import com.hjq.toast.ToastUtils import com.netease.nim.uikit.StatusBarUtil import com.netease.nim.uikit.common.util.sys.TimeUtil @@ -29,20 +23,15 @@ import com.yalantis.ucrop.UCrop import com.chwl.app.R import com.chwl.app.UIHelper import com.chwl.app.application.App -import com.chwl.app.audio.SoundSignatureActivity import com.chwl.app.base.BaseViewBindingActivity import com.chwl.app.common.util.BitmapUtil -import com.chwl.library.common.util.Utils import com.chwl.app.databinding.ActivityUserInfoModifyBinding import com.chwl.app.ui.login.ModifyInfoActivity -import com.chwl.app.ui.user.adapter.UserInfoLabelAdapter -import com.chwl.app.ui.user.adapter.UserModifyLabelAdapter import com.chwl.app.ui.user.adapter.UserPhotoAdapter import com.chwl.app.ui.user.adapter.UserPhotoAdapter.ImageClickListener import com.chwl.app.ui.user.dialog.UserAreaDialog import com.chwl.app.ui.utils.ImageLoadUtils import com.chwl.app.ui.widget.dialog.CommonTipDialog -import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration import com.chwl.app.utils.RegexUtil import com.chwl.core.auth.AuthModel import com.chwl.core.file.FileModel @@ -54,7 +43,6 @@ import com.chwl.library.common.file.FileHelper import com.chwl.library.common.photo.PhotoProviderNew import com.chwl.library.common.util.PhotoCompressCallback import com.chwl.library.common.util.PhotoCompressUtil -import com.chwl.library.common.widget.LinesFlexBoxLayoutManager import com.chwl.library.easypermisssion.EasyPermissions import com.chwl.library.utils.ResUtil import com.chwl.library.utils.TimeUtils @@ -144,17 +132,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity 0 - if (hasSound && ((userInfo.audioCard?.status ?: 0) == 1 || (userInfo.audioCard?.status - ?: 0) == 2) - ) { - binding.tvSoundTip.visibility = View.GONE - binding.llAudio.visibility = View.VISIBLE - binding.tvAudio.text = userInfo.audioCard.second.toString() - } else { - binding.tvSoundTip.visibility = View.VISIBLE - binding.llAudio.visibility = View.GONE - } binding.tvArea.text = userInfo.region } } @@ -164,7 +141,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity checkPermission( - { - // 点击跳转到声音签名页面 - UIHelper.showSoundAct( - this@UserInfoModifyActivity, - Method.AUDIO, - ResUtil.getString(R.string.ui_user_userinfomodifyactivity_07), - mUserInfo?.audioCard - ) - isAvatar = false - }, R.string.ask_again, - Manifest.permission.RECORD_AUDIO - ) R.id.layout_photos -> UserModifyPhotosActivity.startForResult( this@UserInfoModifyActivity, userId, @@ -457,29 +420,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity {// 刷新声音资源 - data?.let { - // 获取数据并刷新显示 - val audioFileUrl = it.getStringExtra(SoundSignatureActivity.AUDIO_FILE) - val audioDuration = it.getIntExtra(SoundSignatureActivity.AUDIO_DURA, 0) - if (TextUtils.isEmpty(audioFileUrl)) { - val soundBean = mUserInfo?.audioCard - soundBean?.audioUrl = "" - soundBean?.second = 0 - soundBean?.status = 0 - binding.tvSoundTip.visibility = View.VISIBLE - binding.llAudio.visibility = View.GONE - } else { - val soundBean = mUserInfo?.audioCard - soundBean?.audioUrl = audioFileUrl - soundBean?.second = audioDuration - soundBean?.status = 1 - binding.tvSoundTip.visibility = View.GONE - binding.llAudio.visibility = View.VISIBLE - binding.tvAudio.text = audioDuration.toString() - } - } - } Method.PHOTO -> { data?.let { val isChanged = diff --git a/app/src/main/res/layout/activity_user_info_modify.xml b/app/src/main/res/layout/activity_user_info_modify.xml index 13339d8ba..bc9989fde 100644 --- a/app/src/main/res/layout/activity_user_info_modify.xml +++ b/app/src/main/res/layout/activity_user_info_modify.xml @@ -243,89 +243,6 @@ - - - - - - - - - - - - - - - - - - - - - - - -