From 7f49a9551735c349980dc9b7106c70c5f9e1463c Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Wed, 1 Feb 2023 11:25:31 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yizhuan/erban/UIHelper.java | 18 - .../erban/audio/AudioRecordActivity.java | 165 +++-- .../yizhuan/erban/ui/im/RouterHandler.java | 3 - .../erban/ui/user/UserInfoFragment.java | 589 ------------------ .../erban/ui/user/UserInfoModifyActivity.kt | 15 - .../res/layout/activity_user_info_modify.xml | 61 -- .../main/res/layout/fragment_user_info.xml | 6 - 7 files changed, 78 insertions(+), 779 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/erban/ui/user/UserInfoFragment.java delete mode 100644 app/src/main/res/layout/fragment_user_info.xml diff --git a/app/src/main/java/com/yizhuan/erban/UIHelper.java b/app/src/main/java/com/yizhuan/erban/UIHelper.java index 2ec34ab8b..273844cc6 100644 --- a/app/src/main/java/com/yizhuan/erban/UIHelper.java +++ b/app/src/main/java/com/yizhuan/erban/UIHelper.java @@ -107,30 +107,12 @@ public class UIHelper { mContext.startActivity(intent); } - public static void showAudioRecordAct(Context mContext) { - Intent intent = new Intent(mContext, AudioRecordActivity.class); - mContext.startActivity(intent); - } - public static void showRecordVoiceAct(Activity mActivity, int requestCode, long voiceId) { Intent intent = new Intent(mActivity, RecordingVoiceActivity.class); intent.putExtra(RecordingVoiceActivity.EXTRA_VOICE_ID, voiceId); mActivity.startActivityForResult(intent, requestCode); } - public static void showMyVoiceAct(Context mContext) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND, ResUtil.getString(R.string.yizhuan_erban_uihelper_01)); - - Intent intent = new Intent(mContext, MyVoiceActivity.class); - mContext.startActivity(intent); - } - - public static void showMyVoiceAct(Fragment mFragment, int requestCode, String label) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND, ResUtil.getString(R.string.yizhuan_erban_uihelper_02) + label); - Intent intent = new Intent(mFragment.getActivity(), MyVoiceActivity.class); - mFragment.startActivityForResult(intent, requestCode); - } - public static void showMyVoiceAct(Activity mActivity, int requestCode, String label) { StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND, ResUtil.getString(R.string.yizhuan_erban_uihelper_03) + label); Intent intent = new Intent(mActivity, MyVoiceActivity.class); diff --git a/app/src/main/java/com/yizhuan/erban/audio/AudioRecordActivity.java b/app/src/main/java/com/yizhuan/erban/audio/AudioRecordActivity.java index c14644823..2ba2d0cd5 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/AudioRecordActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/AudioRecordActivity.java @@ -13,7 +13,7 @@ import com.netease.nimlib.sdk.media.record.AudioRecorder; import com.netease.nimlib.sdk.media.record.IAudioRecordCallback; import com.netease.nimlib.sdk.media.record.RecordType; import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; +import com.yizhuan.erban.base.BaseViewBindingActivity; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityAudiorecordBinding; import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager; @@ -24,7 +24,6 @@ import com.yizhuan.xchat_android_core.room.bean.RoomInfo; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.log.MLog; @@ -37,8 +36,7 @@ import io.reactivex.disposables.Disposable; * @author zhouxiangfeng * @date 2017/5/25 */ -@ActLayoutRes(R.layout.activity_audiorecord) -public class AudioRecordActivity extends BaseBindingActivity { +public class AudioRecordActivity extends BaseViewBindingActivity implements View.OnClickListener { private static final String TAG = "AudioRecordActivity"; @@ -50,18 +48,20 @@ public class AudioRecordActivity extends BaseBindingActivity { + binding.llRecord.setOnClickListener(this); + binding.ivTryListen.setOnClickListener(this); + binding.ivRetryRecord.setOnClickListener(this); + binding.ivRecordSave.setOnClickListener(this); + binding.ivRecord.setOnTouchListener((v, event) -> { switch (event.getAction()) { case MotionEvent.ACTION_DOWN: RoomInfo current = AvRoomDataManager.get().mCurrentRoomInfo; @@ -89,7 +89,7 @@ public class AudioRecordActivity extends BaseBindingActivity finish()); + binding.imgBack.setOnClickListener(v -> finish()); } private void startVoice() { @@ -105,12 +105,12 @@ public class AudioRecordActivity extends BaseBindingActivity { - if (throwable != null) { - onUploadFail(); - } else { - onUpload(url); - } - }); - } - break; - default: + } else { + audioManager.stopPlay(); + binding.ivTryListen.setImageResource(R.drawable.icon_try_listen); + } + } else if(id == R.id.iv_record_save){ + if (null != audioFile) { + Log.i("result_url", "upload before:" + audioFile.getAbsolutePath()); + getDialogManager().showProgressDialog(AudioRecordActivity.this, ResUtil.getString(R.string.erban_audio_audiorecordactivity_08)); + FileModel.get() + .uploadFile(audioFile.getAbsolutePath()) + .compose(bindToLifecycle()) + .subscribe((url, throwable) -> { + if (throwable != null) { + onUploadFail(); + } else { + onUpload(url); + } + }); + } } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index 4168a6a3c..23ff9f575 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -224,9 +224,6 @@ public class RouterHandler { case RouterType.PERSION_SETTING: UIHelper.showUserInfoModifyAct(context, JavaUtil.str2long(routerValue)); break; - case RouterType.MY_VOICE: - UIHelper.showMyVoiceAct(context); - break; case RouterType.VOICE_BOTTLE_PAGE: VoiceMatchActivity.start(context); break; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoFragment.java deleted file mode 100644 index 2bc150de5..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoFragment.java +++ /dev/null @@ -1,589 +0,0 @@ -package com.yizhuan.erban.ui.user; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.text.style.ForegroundColorSpan; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.UIHelper; -import com.yizhuan.erban.audio.RecordingVoiceActivity; -import com.yizhuan.erban.audio.helper.AudioPlayerHelper; -import com.yizhuan.erban.audio.helper.OnPlayListener; -import com.yizhuan.erban.avroom.widget.MessageView; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.module_hall.team.activity.HallTeamMessageActivity; -import com.yizhuan.erban.ui.user.adapter.UserDesAdapter; -import com.yizhuan.xchat_android_core.audio.AudioModel; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamListChangeEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.JoinWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.Unbinder; -import io.reactivex.SingleObserver; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; - -public class UserInfoFragment extends BaseFragment implements View.OnClickListener { - - public static final int REQUEST_CODE_MY_VOICE = 1; - Unbinder unbinder; - - @BindView(R.id.rv_desc) - RecyclerView rvDesc; - - private UserInfo userInfo; - private long userId = 0; - private int from = 1; - private long time; - - private UserDesAdapter mUserDesAdapter; - private boolean isPlaying; - - public static UserInfoFragment newInstance(long userId, int from) { - UserInfoFragment userInfoFragment = new UserInfoFragment(); - Bundle bundle = new Bundle(); - bundle.putLong("userId", userId); - bundle.putInt("from", from); - userInfoFragment.setArguments(bundle); - return userInfoFragment; - } - - @Override - protected void onInitArguments(Bundle bundle) { - super.onInitArguments(bundle); - - if (bundle != null) { - userId = bundle.getLong("userId", 0); - from = bundle.getInt("from", 1); - } - } - - @Override - public void initiate() { - - initList(); - mUserDesAdapter = new UserDesAdapter(mContext, mList); - mUserDesAdapter.setUserId(userId); - - rvDesc.setLayoutManager(new LinearLayoutManager(mContext)); - rvDesc.setAdapter(mUserDesAdapter); - - mUserDesAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { - @Override - public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { - List list = mUserDesAdapter.getData(); - if (ListUtils.isListEmpty(list)) - return; - - UserInfoItem userInfoItem = list.get(position); - if (userInfoItem.getItemType() == UserInfoItem.TYPE_DES_VOICE) { - voiceOption(view); - - } else if (userInfoItem.getItemType() == UserInfoItem.TYPE_DES_FAMILY) { - familyOption((FamilyInfo) userInfoItem.getData()); - - } else if (userInfoItem.getItemType() == UserInfoItem.TYPE_DES_HALL) { - OwnerHallInfo ownerHallInfo = (OwnerHallInfo) userInfoItem.getData(); - hallOption(view, ownerHallInfo); - } - - } - }); - - initData(userInfo); - - } - - private List mList = new ArrayList<>(); - - private void initList() { - mList.clear(); - - // 相册 - UserInfoItem photoItem = new UserInfoItem(UserInfoItem.TYPE_DES_PHOTO); - mList.add(photoItem); - - // 个人介绍 - UserInfoItem descItem = new UserInfoItem(UserInfoItem.TYPE_DES_PERSONAL); - mList.add(descItem); - - // 我的声音 - UserInfoItem voiceItem = new UserInfoItem(UserInfoItem.TYPE_NONE); - voiceItem.setTag(UserInfoItem.TYPE_DES_VOICE); - mList.add(voiceItem); - - // 话题 - UserInfoItem joinWorldsItem = new UserInfoItem(UserInfoItem.TYPE_NONE); - joinWorldsItem.setTag(UserInfoItem.TYPE_DES_JOIN_WORLDS); - mList.add(joinWorldsItem); - - // 家族 - UserInfoItem familyItem = new UserInfoItem(UserInfoItem.TYPE_NONE); - familyItem.setTag(UserInfoItem.TYPE_DES_FAMILY); - mList.add(familyItem); - - // 模厅 - UserInfoItem hallItem = new UserInfoItem(UserInfoItem.TYPE_NONE); - hallItem.setTag(UserInfoItem.TYPE_DES_HALL); - mList.add(hallItem); - - // 战绩 - UserInfoItem GameItem = new UserInfoItem(UserInfoItem.TYPE_NONE); - GameItem.setTag(UserInfoItem.TYPE_DES_GAME); - mList.add(GameItem); - } - - @Override - public void onFindViews() { - super.onFindViews(); - } - - @Override - public void onPause() { - super.onPause(); - AudioPlayerHelper.get().onPause(); - stopVoice(); - } - - @Override - public void onDestroyView() { - EventBus.getDefault().unregister(this); - super.onDestroyView(); - if (unbinder != null) { - unbinder.unbind(); - } - } - - @Override - public void onDestroy() { - super.onDestroy(); - AudioPlayerHelper.get().onDestroy(); - stopVoice(); - } - - private void familyOption(FamilyInfo familyInfo) { - - if (from == UserInfoActivity.Companion.FROM_TYPE_NORMAL) { - //这里限制循环访问, 例如:家族->个人主页->家族->个人主页->.... - FamilyHomeActivity.start(getActivity(), familyInfo.getFamilyId()); - } else { - Activity activity = getActivity(); - if (activity != null) - activity.onBackPressed(); - } - - } - - private void setUserInfoItem(Serializable data, int itemType, boolean canRefresh) { - for (UserInfoItem userInfoItem : mList) { - if (userInfoItem.getTag() == itemType) { - userInfoItem.setItemType(data == null ? UserInfoItem.TYPE_NONE : itemType); - userInfoItem.setData(data); - break; - } - } - - if (canRefresh) - mUserDesAdapter.notifyDataSetChanged(); - - } - - private void initVoiceView(boolean canShow) { - for (UserInfoItem userInfoItem : mList) { - if (userInfoItem.getTag() == UserInfoItem.TYPE_DES_VOICE) { - userInfoItem.setItemType(canShow ? UserInfoItem.TYPE_DES_VOICE : UserInfoItem.TYPE_NONE); - break; - } - } - - } - - private void initJoinWorlds(ArrayList list) { - for (UserInfoItem userInfoItem : mList) { - if (userInfoItem.getTag() == UserInfoItem.TYPE_DES_JOIN_WORLDS) { - userInfoItem.setItemType(list != null && list.size() > 0 ? UserInfoItem.TYPE_DES_JOIN_WORLDS : UserInfoItem.TYPE_NONE); - userInfoItem.setData(list); - break; - } - - } - } - - private void initData(UserInfo userInfo) { - if (userInfo == null) { - return; - } - //每次打开这里都走了四次，先做个处理 - if (System.currentTimeMillis() - time < 2000) { - return; - } - time = System.currentTimeMillis(); - - // 判断是否隐藏声音item - if (AuthModel.get().getCurrentUid() == userId) {// 主态 - initVoiceView(true); - } else {// 客态 - initVoiceView(!StringUtils.isEmpty(userInfo.getUserVoice())); - } - - initJoinWorlds(userInfo.getJoinWorlds()); - - mUserDesAdapter.setUserInfo(userInfo); - setHallData(userInfo); - - } - - @Override - public void onClick(View view) { - } - - private void voiceOption(View view) { - int id = view.getId(); - if (id == R.id.layout_voice_bar) { - voiceClick(); - } else if (id == R.id.iv_voice_more || id == R.id.layout_voice_bar_no_data) { - UIHelper.showMyVoiceAct(this, REQUEST_CODE_MY_VOICE, ResUtil.getString(R.string.ui_user_userinfofragment_01));// 点击则跳转到我的声音页面 - } - } - - private void voiceClick() { - if (AudioPlayerHelper.get().isPlaying()) { - isPlaying = false; - stopVoice(); - } else { - isPlaying = true; - playVoice(); - } - } - - private void playVoice() { - if (StringUtils.isEmpty(userInfo.getUserVoice())) { - return; - } - AudioPlayerHelper.get().playInThread(userInfo.getUserVoice(), new OnPlayListener() { - - @Override - public void onPreStart() { - addPlayCount(userId); - } - - @Override - public void onError(String error) { - if (mUserDesAdapter != null) { - mUserDesAdapter.setPlaying(false);// 播放出错 - mUserDesAdapter.notifyDataSetChanged(); - } - } - - @Override - public void onPrepared() { - if (mUserDesAdapter != null) { - mUserDesAdapter.setPlaying(true);// 准备完毕要开始播放 - mUserDesAdapter.notifyDataSetChanged(); - } - } - - @Override - public void onPlaying(long currDuration) { - } - - @Override - public void onCompletion() { - if (mUserDesAdapter != null) { - mUserDesAdapter.setPlaying(false);// 播放完成 - mUserDesAdapter.notifyDataSetChanged(); - } - } - }); - } - - private void addPlayCount(long voiceUid) { - AudioModel.get().addPlayCount(AuthModel.get().getCurrentUid(), null, voiceUid) - .subscribe(); - } - - private void stopVoice() { - AudioPlayerHelper.get().endPlay(); - if (mUserDesAdapter != null) { - mUserDesAdapter.setPlaying(false);// 触发或点击 停止播放 - mUserDesAdapter.notifyDataSetChanged(); - } - } - - @SuppressWarnings("CheckResult") - - private void setGameInfo() { - UserModel.get().getGameWeek(userId) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(userGameInfos -> { - setUserInfoItem((ArrayList) userGameInfos, UserInfoItem.TYPE_DES_GAME, true); - }); - } - - private void hallOption(View view, OwnerHallInfo ownerHallInfo) { - switch (view.getId()) { - case R.id.stv_apply_hall: - - StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.JOIN_HALL_CLICK, ResUtil.getString(R.string.ui_user_userinfofragment_02), null); - - if (userInfo == null) { - return; - } - String hallName = null; - - if (ownerHallInfo != null) - hallName = ownerHallInfo.getHallName(); - - if (TextUtils.isEmpty(hallName)) { - hallName = ResUtil.getString(R.string.ui_user_userinfofragment_03); - } - MessageView.SpannableBuilder builder = new MessageView.SpannableBuilder(null); - builder.append(ResUtil.getString(R.string.ui_user_userinfofragment_04)) - .append(hallName, new ForegroundColorSpan(getResources().getColor(R.color.appColor))) - .append(ResUtil.getString(R.string.ui_user_userinfofragment_05)); - getDialogManager().showOkCancelDialog(builder.build(), new DialogManager.OkCancelDialogListener() { - @Override - public void onCancel() { - - } - - @Override - public void onOk() { - HallModel.get().applyJoinHall(userInfo.getHallId()) - .compose(RxHelper.bindFragment(UserInfoFragment.this)) - .subscribe(new BeanObserver() { - @Override - public void onErrorMsg(String error) { - toast(error); - } - - @Override - public void onSuccess(String s) { - toast(s); - } - }); - } - }); - break; - case R.id.stv_apply_team: - //加入公开群 - - StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.JOIN_HALL_OPEN_GROUP_CLICK, ResUtil.getString(R.string.ui_user_userinfofragment_06), null); - - if (ownerHallInfo == null) { - return; - } - HTeamModel.get().joinHteam(ownerHallInfo.getPublicChatId()) - .compose(bindToLifecycle()) - .subscribe(new BeanObserver() { - @Override - public void onErrorMsg(String error) { - toast(error); - } - - @Override - public void onSuccess(String s) { - String tid = ownerHallInfo.getPublicTeamId(); - if (!TextUtils.isEmpty(tid)) { - HallTeamMessageActivity.start(getActivity(), tid); - } - } - }); - break; - - case R.id.rl_hall_team_layout: - if (ownerHallInfo == null) { - return; - } - if (ownerHallInfo.getPublicChat() != null && !ownerHallInfo.getPublicChat().isInChat()) { - return; - } - String tid = ownerHallInfo.getPublicTeamId(); - if (!TextUtils.isEmpty(tid)) { - HallTeamMessageActivity.start(getActivity(), tid); - } - break; - } - - } - - private OwnerHallInfo ownerHallInfo; - - /** - * 模厅数据 - */ - private void setHallData(UserInfo userInfo) { - if (userInfo.getHallId() <= 0) { - setUserInfoItem(null, UserInfoItem.TYPE_DES_HALL, true); - return; - } - - HallModel.get().getOwnerHallInfo(userInfo.getUid()) - .compose(RxHelper.bindFragment(this)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(OwnerHallInfo info) { - ownerHallInfo = info; - if (ownerHallInfo == null || ownerHallInfo.getHallId() <= 0) - setUserInfoItem(null, UserInfoItem.TYPE_DES_HALL, true); - - else - setUserInfoItem(ownerHallInfo, UserInfoItem.TYPE_DES_HALL, true); - - } - - @Override - public void onError(Throwable e) { - setUserInfoItem(null, UserInfoItem.TYPE_DES_HALL, true); - } - }); - } - - private void setHallInfo(OwnerHallInfo info) { - - for (UserInfoItem item : mList) { - if (item.getItemType() == UserInfoItem.TYPE_DES_HALL) { - item.setData(info); - break; - } - } - - mUserDesAdapter.notifyDataSetChanged(); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onHteamListChange(HteamListChangeEvent event) { - if (userInfo == null) { - return; - } - setHallData(userInfo); - } - - public void onGetUserInfo(UserInfo userInfo) { - if (isDestroyView) { - return; - } - this.userInfo = userInfo; - - if (!mIsViewCreated) - return; - - initData(userInfo); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onCurrentUserInfoUpdate(LoginUserInfoUpdateEvent event) { - if (UserModel.get().getCacheLoginUserInfo().getUid() == userId) { - userInfo = UserModel.get().getCacheLoginUserInfo(); - initData(userInfo); - } - } - - /** - * 更新主态话题列表 - */ - @Subscribe(threadMode = ThreadMode.MAIN) - public void onMiniWorldStateChangedEvent(MiniWorldStateChangedEvent miniWorldStateChangedEvent) { - if (UserModel.get().getCacheLoginUserInfo().getUid() == userId && - !miniWorldStateChangedEvent.isJoin() && - miniWorldStateChangedEvent.getWorldId() > 0) { - userInfo = UserModel.get().getCacheLoginUserInfo(); - userInfo.removeWorld(miniWorldStateChangedEvent.getWorldId()); - initData(userInfo); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - mView = inflater.inflate(R.layout.fragment_user_info, container, false); - unbinder = ButterKnife.bind(this, mView); - EventBus.getDefault().register(this); - AudioPlayerHelper.get().onCreate(); - return mView; - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == Activity.RESULT_OK) { - if (requestCode == REQUEST_CODE_MY_VOICE) { - String audioFileUrl = data.getStringExtra(RecordingVoiceActivity.AUDIO_FILE); - int audioDuration = data.getIntExtra(RecordingVoiceActivity.AUDIO_DURA, 0); - refreshVoiceDataView(audioFileUrl, audioDuration); - } - } - } - - public void refreshVoiceDataView(String audioFileUrl, int audioDuration) { - UserModel.get().getUserInfoFromServer(userId) - .compose(bindToLifecycle()) - .subscribe(new BeanObserver() { - @Override - public void onErrorMsg(String error) { - - } - - @Override - public void onSuccess(UserInfo Info) { - userInfo = Info; - initData(userInfo); - } - }); - // 跳转到我的声音页面，录制了声音，刷新数据显示 - if (mUserDesAdapter != null) { - mUserDesAdapter.setPlaying(false);// 录制完声音 刷新页面显示 - mUserDesAdapter.notifyDataSetChanged(); - } - } - - public boolean isPlaying() { - return isPlaying; - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt index 6a34950cc..191f57071 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt @@ -115,8 +115,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity 0 - binding.tvNoVoice.visibility = if (hasVoice) View.GONE else View.VISIBLE val adapter = UserPhotoAdapter(userInfo.privatePhoto, 1, userInfo.uid) adapter.setSmall(true) adapter.setImageClickListener(this) @@ -145,7 +143,6 @@ class UserInfoModifyActivity : BaseViewBindingActivity checkPermission( - { - // 点击跳转到我的声音页面 - UIHelper.showMyVoiceAct( - this@UserInfoModifyActivity, - Method.AUDIO, - ResUtil.getString(R.string.ui_user_userinfomodifyactivity_07) - ) - isAvatar = false - }, R.string.ask_again, - Manifest.permission.RECORD_AUDIO - ) R.id.ll_audio_record -> checkPermission( { // 点击跳转到声音签名页面 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 81d2160d7..0a32bc0e0 100644 --- a/app/src/main/res/layout/activity_user_info_modify.xml +++ b/app/src/main/res/layout/activity_user_info_modify.xml @@ -187,67 +187,6 @@ - - - - - - - - - - - - - - -