diff --git a/app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt b/app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt new file mode 100644 index 000000000..7f0f97ac8 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/association/AssociationViewModel.kt @@ -0,0 +1,42 @@ +package com.yizhuan.erban.association + +import androidx.lifecycle.MutableLiveData +import com.yizhuan.erban.base.BaseViewModel +import com.yizhuan.xchat_android_core.association.AssociationModel +import com.yizhuan.xchat_android_core.association.HallListInfo +import com.yizhuan.xchat_android_core.association.ClanListInfo +import com.yizhuan.xchat_android_core.bean.response.ListResult + +class AssociationViewModel : BaseViewModel() { + + //公会列表 + private val _clanListLiveData = MutableLiveData?>() + val clanListLiveData: MutableLiveData?> = _clanListLiveData + + //牌照房列表 + private val _hallListLiveData = MutableLiveData?>() + val hallListLiveData: MutableLiveData?> = _hallListLiveData + + fun getClanList() { + safeLaunch( + block = { + _clanListLiveData.value = AssociationModel.getClanList() + }, + onError = { + _clanListLiveData.value = null + } + ) + } + + fun getHallList() { + safeLaunch( + block = { + _hallListLiveData.value = AssociationModel.getHallList() + }, + onError = { + _hallListLiveData.value = null + } + ) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/AssociationAdapter.java b/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationAdapter.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/home/adapter/AssociationAdapter.java rename to app/src/main/java/com/yizhuan/erban/association/adapter/AssociationAdapter.java index 976f86a0b..e5fab78ac 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/AssociationAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.adapter; +package com.yizhuan.erban.association.adapter; import android.view.View; import android.widget.ImageView; @@ -7,8 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo; +import com.yizhuan.xchat_android_core.association.ClanListInfo; /** * Created by yudi diff --git a/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationRoomAdapter.java b/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationRoomAdapter.java new file mode 100644 index 000000000..a4aacbd2e --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/association/adapter/AssociationRoomAdapter.java @@ -0,0 +1,47 @@ +package com.yizhuan.erban.association.adapter; + +import android.view.View; +import android.widget.ImageView; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.yizhuan.erban.R; +import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; +import com.yizhuan.xchat_android_core.association.ClanListInfo; +import com.yizhuan.xchat_android_core.association.HallListInfo; + +/** + * Created by yudi + * on 2018/3/2. + */ +public class AssociationRoomAdapter extends BaseQuickAdapter { + + public AssociationRoomAdapter() { + super(R.layout.item_association); + + } + + @Override + protected void convert(BaseViewHolder helper, HallListInfo item) { + if (helper.getAdapterPosition() == 0) { + helper.getView(R.id.view_guild).setVisibility(View.VISIBLE); + helper.getView(R.id.view_guild).setBackgroundResource(R.drawable.guild_one); + } else if (helper.getAdapterPosition() == 1) { + helper.getView(R.id.view_guild).setVisibility(View.VISIBLE); + helper.getView(R.id.view_guild).setBackgroundResource(R.drawable.guild_two); + } else if (helper.getAdapterPosition() == 2) { + helper.getView(R.id.view_guild).setVisibility(View.VISIBLE); + helper.getView(R.id.view_guild).setBackgroundResource(R.drawable.guild_three); + } else { + helper.getView(R.id.view_guild).setVisibility(View.GONE); + helper.getView(R.id.tv_guild).setVisibility(View.VISIBLE); + helper.setText(R.id.tv_guild, String.valueOf(helper.getAdapterPosition() + 1)); + } + + ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_guild_icon), item.getOwnerAvatar()); + helper.setText(R.id.tv_name, item.getOwnerNick()); + ImageView iv_guild_image = helper.getView(R.id.iv_guild_image); +// ImageLoadUtilsV2.loadImage(iv_guild_image, item.getLevelIcon()); + + } +} diff --git a/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationFragment.kt b/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationFragment.kt new file mode 100644 index 000000000..1595e41b1 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationFragment.kt @@ -0,0 +1,64 @@ +package com.yizhuan.erban.association.fragment + +import android.os.Bundle +import android.view.View +import androidx.fragment.app.activityViewModels +import androidx.recyclerview.widget.LinearLayoutManager +import com.chad.library.adapter.base.BaseQuickAdapter +import com.yizhuan.erban.R +import com.yizhuan.erban.base.BaseViewBindingFragment +import com.yizhuan.erban.common.EmptyViewHelper +import com.yizhuan.erban.databinding.FragmentAssociationBinding +import com.yizhuan.erban.association.AssociationViewModel +import com.yizhuan.erban.association.adapter.AssociationAdapter +import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity +import com.yizhuan.erban.ui.utils.RVDelegate +import com.yizhuan.xchat_android_core.association.ClanListInfo +import com.yizhuan.xchat_android_library.utils.ResUtil + + +class AssociationFragment : BaseViewBindingFragment() { + + companion object { + fun newInstance(): AssociationFragment { + val args = Bundle() + val fragment = AssociationFragment() + fragment.arguments = args + return fragment + } + } + + private lateinit var associationAdapter: AssociationAdapter + private lateinit var rvDelegate: RVDelegate + + private val associationViewModel: AssociationViewModel by activityViewModels() + + override fun init() { + associationAdapter = + AssociationAdapter() + associationAdapter.onItemClickListener = + BaseQuickAdapter.OnItemClickListener { _: BaseQuickAdapter<*, *>?, _: View?, position: Int -> + val info = associationAdapter.getItem(position) + if (info != null && info.clanElderUid != 0L) { + ModuleClanActivity.start(context, info.clanElderUid) + } + } + rvDelegate = RVDelegate.Builder() + .setAdapter(associationAdapter) + .setRecyclerView(binding.recyclerView) + .setEmptyView( + EmptyViewHelper.createEmptyView( + context, + ResUtil.getString(R.string.association_list_empty) + ) + ) + .setLayoutManager(LinearLayoutManager(mContext)) + .build() + + associationViewModel.clanListLiveData.observe(this) { + rvDelegate.loadData(it) + } + associationViewModel.getClanList() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationRoomFragment.kt new file mode 100644 index 000000000..318f8fc2e --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/association/fragment/AssociationRoomFragment.kt @@ -0,0 +1,60 @@ +package com.yizhuan.erban.association.fragment + +import android.os.Bundle +import android.view.View +import androidx.fragment.app.activityViewModels +import androidx.recyclerview.widget.LinearLayoutManager +import com.chad.library.adapter.base.BaseQuickAdapter +import com.yizhuan.erban.R +import com.yizhuan.erban.base.BaseViewBindingFragment +import com.yizhuan.erban.common.EmptyViewHelper +import com.yizhuan.erban.databinding.FragmentAssociationRoomBinding +import com.yizhuan.erban.association.AssociationViewModel +import com.yizhuan.erban.association.adapter.AssociationAdapter +import com.yizhuan.erban.association.adapter.AssociationRoomAdapter +import com.yizhuan.erban.ui.utils.RVDelegate +import com.yizhuan.xchat_android_core.association.HallListInfo +import com.yizhuan.xchat_android_library.utils.ResUtil + + +class AssociationRoomFragment : BaseViewBindingFragment() { + + companion object { + fun newInstance(): AssociationRoomFragment { + val args = Bundle() + val fragment = AssociationRoomFragment() + fragment.arguments = args + return fragment + } + } + + private lateinit var associationRoomAdapter: AssociationRoomAdapter + private lateinit var rvDelegate: RVDelegate + + private val associationViewModel: AssociationViewModel by activityViewModels() + + override fun init() { + associationRoomAdapter = AssociationRoomAdapter() + associationRoomAdapter.onItemClickListener = + BaseQuickAdapter.OnItemClickListener { _: BaseQuickAdapter<*, *>?, _: View?, position: Int -> + + } + rvDelegate = RVDelegate.Builder() + .setAdapter(associationRoomAdapter) + .setRecyclerView(binding.recyclerView) + .setEmptyView( + EmptyViewHelper.createEmptyView( + context, + ResUtil.getString(R.string.association_hall_list_empty) + ) + ) + .setLayoutManager(LinearLayoutManager(mContext)) + .build() + + associationViewModel.hallListLiveData.observe(this) { + rvDelegate.loadData(it) + } + associationViewModel.getHallList() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/AssociationActivity.kt b/app/src/main/java/com/yizhuan/erban/home/activity/AssociationActivity.kt index f31d2c74b..95603c57a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/AssociationActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/home/activity/AssociationActivity.kt @@ -1,106 +1,87 @@ -package com.yizhuan.erban.home.activity; +package com.yizhuan.erban.home.activity -import android.annotation.SuppressLint; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; +import android.content.Context +import android.content.Intent +import android.widget.LinearLayout +import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.viewpager.widget.ViewPager +import com.netease.nim.uikit.StatusBarUtil +import com.yizhuan.erban.R +import com.yizhuan.erban.base.BaseViewBindingActivity +import com.yizhuan.erban.databinding.ActivityAssociationBinding +import com.yizhuan.erban.association.fragment.AssociationFragment +import com.yizhuan.erban.association.fragment.AssociationRoomFragment +import com.yizhuan.erban.ui.user.adapter.CommonWrapIndicatorAdapter +import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter +import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator +import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper +import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.yizhuan.xchat_android_library.utils.ResUtil -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +class AssociationActivity : BaseViewBindingActivity() { -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.home.adapter.AssociationAdapter; -import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import butterknife.BindView; -import butterknife.ButterKnife; - -public class AssociationActivity extends BaseActivity implements SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener { - @BindView(R.id.recycler_view) - RecyclerView recyclerView; - - private AssociationAdapter associationAdapter; - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_association); - ButterKnife.bind(this); - initWhiteTitleBar(ResUtil.getString(R.string.association_list)); - initRecyclerView(); + companion object { + fun start(context: Context) { + val intent = Intent(context, AssociationActivity::class.java) + context.startActivity(intent) + } } - @Override - protected void onResume() { - super.onResume(); - loadData(); + override fun init() { + initWhiteTitleBar(ResUtil.getString(R.string.association_list)) + initDetail() } - public static void start(Context context) { - Intent intent = new Intent(context, AssociationActivity.class); - context.startActivity(intent); - } - - private void initRecyclerView() { - recyclerView.setLayoutManager(new LinearLayoutManager(this)); - associationAdapter = new AssociationAdapter(); - associationAdapter.setOnItemClickListener((adapter, view, position) -> { - ClanListInfo info = associationAdapter.getItem(position); - if(info != null && info.getClanElderUid() != 0L) { - ModuleClanActivity.start(AssociationActivity.this, info.getClanElderUid()); + /** + * 公會 + */ + private fun initDetail() { + val viewPager: ViewPager = binding.viewPagerDetail + val magicIndicator: MagicIndicator = binding.magicIndicator + val fragmentList: MutableList = ArrayList() + val pagerAdapter = UserInfoPagerAdapter(supportFragmentManager, fragmentList) + val tagList: MutableList = ArrayList() + tagList.add(getString(R.string.me_association)) + tagList.add(getString(R.string.me_room)) + fragmentList.add(AssociationFragment.newInstance()) + fragmentList.add(AssociationRoomFragment.newInstance()) + val commonNavigator = CommonNavigator(context) + commonNavigator.isAdjustMode = 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.adapter = pagerAdapter + ViewPagerHelper.bind(magicIndicator, viewPager) + viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + override fun onPageScrolled( + position: Int, + positionOffset: Float, + positionOffsetPixels: Int + ) { } - }); - recyclerView.setAdapter(associationAdapter); - } + override fun onPageSelected(position: Int) { + viewPager.requestLayout() + } - - @SuppressLint("CheckResult") - private void loadData() { - HallModel.get().getClanList() - .compose(bindToLifecycle()) - .subscribe(info -> { - if (ListUtils.isListEmpty(info)) { - showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.association_list_empty)); - } else { - hideStatus(); - } - associationAdapter.setNewData(info); - }); - } - - - @Override - public void onLoadMoreRequested() { + override fun onPageScrollStateChanged(state: Int) {} + }) } - @Override - public void onRefresh() { - loadData(); + override fun needSteepStateBar(): Boolean { + return true } - @Override - protected boolean needSteepStateBar() { - return true; + override fun setStatusBar() { + super.setStatusBar() + StatusBarUtil.transparencyBar(this) + StatusBarUtil.StatusBarLightMode(this) } - @Override - protected void setStatusBar() { - super.setStatusBar(); - StatusBarUtil.transparencyBar(this); - StatusBarUtil.StatusBarLightMode(this); - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt index 92e598c56..8cf6df27c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt @@ -349,7 +349,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { ) mBinding.llAssociation.setOnClickListener { //公會周榜 - AssociationActivity.start(context) + context?.let { it1 -> AssociationActivity.start(it1) } } } } diff --git a/app/src/main/res/layout/activity_association.xml b/app/src/main/res/layout/activity_association.xml index 12b4ad790..5d2dd8f05 100644 --- a/app/src/main/res/layout/activity_association.xml +++ b/app/src/main/res/layout/activity_association.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" tools:context=".home.activity.AssociationActivity"> @@ -12,19 +13,21 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_30" /> - - - - - - - + android:layout_height="25dp" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/dp_10" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/title_bar"/> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_association.xml b/app/src/main/res/layout/fragment_association.xml new file mode 100644 index 000000000..ce676aea9 --- /dev/null +++ b/app/src/main/res/layout/fragment_association.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_association_room.xml b/app/src/main/res/layout/fragment_association_room.xml new file mode 100644 index 000000000..ce676aea9 --- /dev/null +++ b/app/src/main/res/layout/fragment_association_room.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e02c30932..ae38076a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4920,6 +4920,7 @@ 複製鏈接 公會周榜 還沒有公會榜單哦 + 還沒有房間榜單哦 暫無轉贈記錄 請輸入用戶ID 僅顯示最近三個月記錄 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/association/AssociationModel.kt b/core/src/main/java/com/yizhuan/xchat_android_core/association/AssociationModel.kt index 46c4b7056..7f5615eb3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/association/AssociationModel.kt +++ b/core/src/main/java/com/yizhuan/xchat_android_core/association/AssociationModel.kt @@ -3,13 +3,9 @@ package com.yizhuan.xchat_android_core.association import com.yizhuan.xchat_android_core.base.BaseModel import com.yizhuan.xchat_android_core.bean.response.ListResult import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo import com.yizhuan.xchat_android_core.utils.net.launchRequest import com.yizhuan.xchat_android_library.net.rxnet.RxNet import retrofit2.http.GET -import retrofit2.http.Query object AssociationModel : BaseModel() { @@ -20,6 +16,11 @@ object AssociationModel : BaseModel() { api.getClanList() } + suspend fun getHallList(): ListResult? = + launchRequest { + api.getHallList() + } + private interface Api { /** @@ -28,6 +29,12 @@ object AssociationModel : BaseModel() { @GET("/clan/list") suspend fun getClanList(): ServiceResult> + /** + * 获取牌照房 + */ + @GET("/hall/list") + suspend fun getHallList(): ServiceResult> + } } \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/association/HallListInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/association/HallListInfo.java new file mode 100644 index 000000000..e7ad6cbdc --- /dev/null +++ b/core/src/main/java/com/yizhuan/xchat_android_core/association/HallListInfo.java @@ -0,0 +1,19 @@ +package com.yizhuan.xchat_android_core.association; + +import lombok.Data; + +@Data +public class HallListInfo { + private Long hallId; + private String hallName; + private Long clanId; + private int roleType; + private Long ownerUid; + private String ownerNick; + private String ownerAvatar; + private Integer memberCount; + private Long ownerErbanNo; + private Double roomIncome; + private int applyBtnStatus;//0=不显示 1=可申请 2=已申请 + +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java index 735e9adb4..e92fefc79 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java @@ -10,7 +10,6 @@ import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthListResult; import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallMenuByUidResult; import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java index bb89ca0c6..35bc57a56 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java @@ -4,8 +4,6 @@ package com.yizhuan.xchat_android_core.module_hall.hall; import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanListInfo.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanListInfo.java deleted file mode 100644 index 41f10a012..000000000 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanListInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; - -import lombok.Data; - -@Data -public class ClanListInfo { - private int clanId; - private long clanElderUid; - private String avatar; - private String name; - private String levelIcon; - private double income; - private int level; - private int applyBtnStatus;//0=不显示 1=可申请 2=已申请 -}