diff --git a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java index fa7890acf..857c81ddb 100644 --- a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java @@ -680,7 +680,10 @@ public class AVRoomActivity extends BaseMvpActivity() { private val vm: UserInfoViewModel by activityViewModels() - private var dynamicAdapter: UserInfoDynamicAdapter? = null +// private var dynamicAdapter: UserInfoDynamicAdapter? = null override fun init() { - EventBus.getDefault().register(this) +// EventBus.getDefault().register(this) vm.hallData.observe(this) { initPersonalData(it) @@ -51,7 +33,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment) { - if (dynamicAdapter == null) { - dynamicAdapter = UserInfoDynamicAdapter(mContext) - dynamicAdapter?.setEnableLoadMore(false) - dynamicAdapter?.setOnItemChildClickListener { _, view: View, pos: Int -> - val bean: WorldDynamicBean = - dynamicAdapter?.getItem(pos) ?: return@setOnItemChildClickListener - if (view.id == R.id.iv_more) { - val list: MutableList = ArrayList() - if (!UserModel.get().isMyseft(bean.uid)) { - val item = ButtonItem( - getString(R.string.me_shield_dynamic) - ) { - UserModel.get().addReport(bean.dynamicId, 0) - .subscribe(object : BeanObserver() { - override fun onErrorMsg(error: String) { - dialogManager.dismissDialog() - toast(error) - } +// /** +// * 动态列表 +// * +// * @param worldDynamicList +// */ +// private fun initDynamicList(worldDynamicList: List) { +// if (dynamicAdapter == null) { +// dynamicAdapter = UserInfoDynamicAdapter(mContext) +// dynamicAdapter?.setEnableLoadMore(false) +// dynamicAdapter?.setOnItemChildClickListener { _, view: View, pos: Int -> +// val bean: WorldDynamicBean = +// dynamicAdapter?.getItem(pos) ?: return@setOnItemChildClickListener +// if (view.id == R.id.iv_more) { +// val list: MutableList = ArrayList() +// if (!UserModel.get().isMyseft(bean.uid)) { +// val item = ButtonItem( +// getString(R.string.me_shield_dynamic) +// ) { +// UserModel.get().addReport(bean.dynamicId, 0) +// .subscribe(object : BeanObserver() { +// override fun onErrorMsg(error: String) { +// dialogManager.dismissDialog() +// toast(error) +// } +// +// override fun onSuccess(s: String) { +// dialogManager.dismissDialog() +// toast(ResUtil.getString(R.string.me_shield_success)) +// if (pos < (dynamicAdapter?.data?.size ?: 0)) { +// if (bean == dynamicAdapter?.getItem(pos)) { +// dynamicAdapter?.remove(pos) +// } +// } +// } +// }) +// } +// list.add(item) +// } +// if (!UserModel.get().isMyseft(bean.uid)) { +// val blackListItem = ButtonItemFactory.createAddToBlackListItem( +// dialogManager, bean.uid.toString() +// ) +// list.add(blackListItem) +// } +// if (!UserModel.get().isMyseft(bean.uid)) { +// val item = ButtonItem( +// getString(R.string.me_report_dynamic) +// ) { +// UIHelper.showReportPage( +// mContext, bean.uid, +// XConstants.REPORT_TYPE_DYNAMIC_SQUARE +// ) +// } +// list.add(item) +// } +// if (UserModel.get().isMyseft(bean.uid) || +// isThisWorldOwner(bean) +// ) { +// val item = ButtonItem( +// getString(R.string.me_delete) +// ) { deleteDynamic(pos, dynamicAdapter) } +// list.add(item) +// } +// dialogManager.showCommonPopupDialog(list, getString(R.string.cancel)) +// } else if (view.id == R.id.ll_share) { +// ShareDynamicHelper(activity).share(bean) +// } +// } +// binding.mRecyclerView.adapter = dynamicAdapter +// } +// dynamicAdapter?.setNewData(worldDynamicList) +// } - override fun onSuccess(s: String) { - dialogManager.dismissDialog() - toast(ResUtil.getString(R.string.me_shield_success)) - if (pos < (dynamicAdapter?.data?.size ?: 0)) { - if (bean == dynamicAdapter?.getItem(pos)) { - dynamicAdapter?.remove(pos) - } - } - } - }) - } - list.add(item) - } - if (!UserModel.get().isMyseft(bean.uid)) { - val blackListItem = ButtonItemFactory.createAddToBlackListItem( - dialogManager, bean.uid.toString() - ) - list.add(blackListItem) - } - if (!UserModel.get().isMyseft(bean.uid)) { - val item = ButtonItem( - getString(R.string.me_report_dynamic) - ) { - UIHelper.showReportPage( - mContext, bean.uid, - XConstants.REPORT_TYPE_DYNAMIC_SQUARE - ) - } - list.add(item) - } - if (UserModel.get().isMyseft(bean.uid) || - isThisWorldOwner(bean) - ) { - val item = ButtonItem( - getString(R.string.me_delete) - ) { deleteDynamic(pos, dynamicAdapter) } - list.add(item) - } - dialogManager.showCommonPopupDialog(list, getString(R.string.cancel)) - } else if (view.id == R.id.ll_share) { - ShareDynamicHelper(activity).share(bean) - } - } - binding.mRecyclerView.adapter = dynamicAdapter - } - dynamicAdapter?.setNewData(worldDynamicList) - } +// +// private fun deleteDynamic(pos: Int, adapter: UserInfoDynamicAdapter?) { +// dialogManager.showOkCancelWithTitleDialog(getString(R.string.me_cannot_be_restored), +// DialogManager.OkCancelDialogListener { +// val bean = adapter?.getItem(pos) ?: return@OkCancelDialogListener +// DynamicModel.get().delete(bean.worldId, bean.dynamicId) +// .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) +// .doOnSubscribe { dialogManager.showProgressDialog(mContext) } +// .subscribe(object : DontWarnObserver() { +// override fun accept(s: String?, error: String?) { +// super.accept(s, error) +// dialogManager.dismissDialog() +// if (error != null) { +// toast(error) +// } else { +// toast(getString(R.string.me_successfully_delete)) +// if (pos < adapter.data.size) { +// if (bean == adapter.getItem(pos)) { +// adapter.remove(pos) +// } +// } +// } +// } +// }) +// }) +// } +// /** +// * 判断自己是不是该世界的创始人 +// */ +// private fun isThisWorldOwner(bean: WorldDynamicBean?): Boolean { +// return bean != null && bean.worldUid == AuthModel.get().currentUid +// } - private fun deleteDynamic(pos: Int, adapter: UserInfoDynamicAdapter?) { - dialogManager.showOkCancelWithTitleDialog(getString(R.string.me_cannot_be_restored), - DialogManager.OkCancelDialogListener { - val bean = adapter?.getItem(pos) ?: return@OkCancelDialogListener - DynamicModel.get().delete(bean.worldId, bean.dynamicId) - .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) - .doOnSubscribe { dialogManager.showProgressDialog(mContext) } - .subscribe(object : DontWarnObserver() { - override fun accept(s: String?, error: String?) { - super.accept(s, error) - dialogManager.dismissDialog() - if (error != null) { - toast(error) - } else { - toast(getString(R.string.me_successfully_delete)) - if (pos < adapter.data.size) { - if (bean == adapter.getItem(pos)) { - adapter.remove(pos) - } - } - } - } - }) - }) - } +// @Subscribe(threadMode = ThreadMode.MAIN) +// fun onDynamicRefreshEvent(event: DynamicRefreshEvent?) { +// if (isResumed) { +// vm.userInfoDetailData.observe(this) { +// initInfoData(it) +// initDynamicList(it.dynamicInfo) +// } +// } +// } - /** - * 判断自己是不是该世界的创始人 - */ - private fun isThisWorldOwner(bean: WorldDynamicBean?): Boolean { - return bean != null && bean.worldUid == AuthModel.get().currentUid - } - - @Subscribe(threadMode = ThreadMode.MAIN) - fun onDynamicRefreshEvent(event: DynamicRefreshEvent?) { - if (isResumed) { - vm.userInfoDetailData.observe(this) { - initInfoData(it) - initDynamicList(it.dynamicInfo) - } - } - } - - override fun onDestroyView() { - EventBus.getDefault().unregister(this) - super.onDestroyView() - } +// override fun onDestroyView() { +// EventBus.getDefault().unregister(this) +// super.onDestroyView() +// } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml index 7bb062029..bbdc242cd 100644 --- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml +++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml @@ -181,17 +181,17 @@ - + + + + + + + + + + +