diff --git a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java index eb6a40d62..738ada96b 100644 --- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoActivity.java @@ -138,7 +138,6 @@ public class UserInfoActivity extends BaseBindingActivity() { - - override fun init() { - initGiftList() - binding.ivGiftDetail.setOnClickListener { - val starter = Intent(context, UserGiftActivity::class.java) - context?.startActivity(starter) - } - } - - /** - * 礼物列表 - * - * @param list - */ - private fun initGiftList() { - val viewPager = binding.viewPagerGift - val magicIndicator: MagicIndicator = binding.magicIndicatorGift - val fragmentList: MutableList = ArrayList(2) - //礼物类型 1:普通礼物;2:辛运礼物 - fragmentList.add(UserInfoGiftFragment.newInstance(1, false)) - fragmentList.add(UserInfoGiftFragment.newInstance(2, false)) - val tagList: MutableList = ArrayList(2) - tagList.add(getString(R.string.me_ordinary_gift)) - tagList.add(getString(R.string.me_lucky_gift)) - val commonNavigator = CommonNavigator(context) - commonNavigator.setTitleWrapContent(true) - val magicIndicatorAdapter = CommonWrapIndicatorAdapter(context, tagList) - magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? -> - viewPager.currentItem = position - } - commonNavigator.adapter = magicIndicatorAdapter - magicIndicator.navigator = commonNavigator - commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE - viewPager.offscreenPageLimit = 2 - viewPager.adapter = CommonVPAdapter(childFragmentManager, lifecycle, fragmentList) - ViewPagerHelper.bind(magicIndicator, viewPager) - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt deleted file mode 100644 index 9b9291d7b..000000000 --- a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoInfoFragment.kt +++ /dev/null @@ -1,268 +0,0 @@ -package com.chwl.app.ui.user.fragment - -import android.view.View -import androidx.fragment.app.activityViewModels -import com.netease.nim.uikit.common.util.sys.TimeUtil -import com.chwl.app.R -import com.chwl.app.base.BaseViewBindingFragment -import com.chwl.app.databinding.FragmentUserinfoUserinfoBinding -import com.chwl.app.module_hall.hall.activity.ModuleClanActivity -import com.chwl.app.module_hall.hall.activity.ModuleHallActivity -import com.chwl.app.ui.user.viewmodel.UserInfoViewModel -import com.chwl.app.ui.webview.CommonWebViewActivity -import com.chwl.core.UriProvider -import com.chwl.core.auth.AuthModel -import com.chwl.core.family.bean.FamilyInfo -import com.chwl.core.module_hall.hall.bean.ClanAndHallInfo -import com.chwl.core.module_hall.hall.bean.ClanInfo -import com.chwl.core.module_hall.hall.bean.H5FamilyInfo -import com.chwl.core.module_hall.hall.bean.HallInfo -import com.chwl.core.user.UserInfoUiMgr -import com.chwl.core.user.bean.UserDetailInfo - -class UserInfoInfoFragment : BaseViewBindingFragment() { - - private val vm: UserInfoViewModel by activityViewModels() - -// private var dynamicAdapter: UserInfoDynamicAdapter? = null - - override fun init() { -// EventBus.getDefault().register(this) - - vm.userClanData.observe(this) { - val clanInfo = it.asClanHall() - if (clanInfo != null) { - initPersonalData(clanInfo) - } else { - val familyInfo = it.asFamily() - if (familyInfo != null) { - initPersonalData(familyInfo) - } - } - } - - vm.userInfoDetailData.observe(this) { - initInfoData(it) -// initDynamicList(it.dynamicInfo) - } - - } - - private fun initInfoData(bean: UserDetailInfo.DataBean) { - val birth = TimeUtil.getChinaDateTimeString(bean.birth, "yyyy-MM-dd") - binding.tvBirth.text = birth - binding.tvArea.text = bean.region - } - - private fun initPersonalData(clanAndHallInfo: ClanAndHallInfo) { - val hallInfo: HallInfo? = clanAndHallInfo.hall - val clanInfo: ClanInfo? = clanAndHallInfo.clan - - if (AuthModel.get().currentUid == UserInfoUiMgr.get().uid) { - binding.tvMore.visibility = View.GONE - binding.llRoom.visibility = View.VISIBLE - binding.llAssociation.visibility = View.VISIBLE - } else { - binding.tvMore.visibility = View.VISIBLE - binding.llRoom.visibility = View.GONE - binding.llAssociation.visibility = View.GONE - binding.tvMore.setOnClickListener { - binding.tvMore.visibility = View.GONE - binding.llRoom.visibility = View.VISIBLE - if (clanInfo != null && clanInfo.id > 0) { - binding.llAssociation.visibility = View.VISIBLE - } else { - binding.llAssociation.visibility = View.GONE - } - } - } - - if (hallInfo != null && hallInfo.hallId > 0) { - binding.tvRoom.visibility = View.VISIBLE - binding.tvJoinRoom.visibility = View.GONE - binding.tvRoom.text = hallInfo.hallName - } else { - binding.tvRoom.visibility = View.GONE - binding.tvJoinRoom.visibility = View.VISIBLE - if (AuthModel.get().currentUid == UserInfoUiMgr.get().uid) { - binding.tvJoinRoom.text = getString(R.string.no_room_has_been_added_yet) - } else { - binding.tvJoinRoom.text = getString(R.string.user_no_room_has_been_added_yet) - } - } - if (clanInfo != null && clanInfo.id > 0) { - binding.tvAssociation.text = clanInfo.name - } else { - binding.llAssociation.visibility = View.GONE - } - - binding.tvRoom.setOnClickListener { - if (hallInfo != null && hallInfo.hallId != 0L) { - ModuleHallActivity.start( - context, - hallInfo.hallId, - hallInfo.ownerUid - ) - } - } - - binding.tvAssociation.setOnClickListener { - ModuleClanActivity.start(context, vm.userId) - } - - } - - private fun initPersonalData(familyInfo: H5FamilyInfo) { - if (AuthModel.get().currentUid == UserInfoUiMgr.get().uid) { - binding.tvMore.visibility = View.GONE - binding.llRoom.visibility = View.GONE - binding.llAssociation.visibility = View.VISIBLE - } else { - binding.tvMore.visibility = View.VISIBLE - binding.llRoom.visibility = View.GONE - binding.llAssociation.visibility = View.GONE - binding.tvMore.setOnClickListener { - binding.tvMore.visibility = View.GONE - binding.llRoom.visibility = View.VISIBLE - if ((familyInfo.familyId ?: 0) > 0L) { - binding.llAssociation.visibility = View.VISIBLE - } else { - binding.llAssociation.visibility = View.GONE - } - } - } - - binding.tvJoinRoom.visibility = View.GONE - if ((familyInfo.familyId ?: 0) > 0L) { - binding.tvAssociation.text = familyInfo.familyName - } else { - binding.llAssociation.visibility = View.GONE - } - binding.tvAssociation.setOnClickListener { - CommonWebViewActivity.start(context, familyInfo.getFullMyFamilyUrl()) - } - - } -// /** -// * 动态列表 -// * -// * @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) -// } - -// -// 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 -// } - -// @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() -// } - -} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml b/app/src/main/res/layout/fragment_userinfo_gift_wall.xml deleted file mode 100644 index a1a8e5570..000000000 --- a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml deleted file mode 100644 index b329f85b4..000000000 --- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gradle.properties b/gradle.properties index 3c7ec7d56..412710f26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ COMPILE_SDK_VERSION=33 MIN_SDK_VERSION=21 TARGET_SDK_VERSION=33 -version_name=1.0.8 +version_name=1.0.9 version_code=11 #systemProp.https.proxyHost=127.0.0.1