yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

Browse Source
This commit is contained in:
zlzw 2024-03-20 16:39:47 +08:00
commit f3d19e37bb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -164,7 +164,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private ViewPager mViewPager; private ViewPager mViewPager;
private List<FrameLayout> mViewList; private List<FrameLayout> mViewList;
private MainHomeComViewHolder mainHomeComViewHolder; private MainHomeComViewHolder mainHomeComViewHolder;
private MainHomeLiveViewHolder mainHomeLiveViewHolder; private MainHomeViewHolder mainHomeViewHolder;
private MainHomeCommunityViewHolder mMainHomeCommunityViewHolder; private MainHomeCommunityViewHolder mMainHomeCommunityViewHolder;
private MainMessageViewHolder mainMessageViewHolder; private MainMessageViewHolder mainMessageViewHolder;
private MainMeViewHolder mMeViewHolder; private MainMeViewHolder mMeViewHolder;
@ -1155,10 +1155,10 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
mainHomeComViewHolder = new MainHomeComViewHolder(mContext, parent); mainHomeComViewHolder = new MainHomeComViewHolder(mContext, parent);
vh = mainHomeComViewHolder; vh = mainHomeComViewHolder;
} else if (position == 1) { } else if (position == 1) {
/* mainHomeLiveViewHolder = new MainHomeLiveViewHolder(mContext, parent);//直播 mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
vh = mainHomeLiveViewHolder;*/ vh = mainHomeViewHolder;
mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播 /* mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
vh = mMainHomeCommunityViewHolder; vh = mMainHomeCommunityViewHolder;*/
} else if (position == 2) { } else if (position == 2) {
mainMessageViewHolder = new MainMessageViewHolder(this, parent); mainMessageViewHolder = new MainMessageViewHolder(this, parent);
vh = mainMessageViewHolder; vh = mainMessageViewHolder;

3
main/src/main/java/com/yunbao/main/views/MainHomeNewViewHolder.java
View File

@ -25,6 +25,7 @@ import com.yunbao.common.manager.CommunityTypeManager;
import com.yunbao.common.manager.OpenAdManager; import com.yunbao.common.manager.OpenAdManager;
import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.adapter.MainHomeComAdapter; import com.yunbao.main.adapter.MainHomeComAdapter;
import com.yunbao.main.adapter.MainHomeComClassAdapter; import com.yunbao.main.adapter.MainHomeComClassAdapter;
@ -92,7 +93,7 @@ public class MainHomeNewViewHolder extends AbsMainHomeChildViewHolder implements
@Override @Override
public void init() { public void init() {
List<NewCommunityType> list = new CommunityTypeManager(mContext).getCommunityTypeList(); List<NewCommunityType> list = new CommunityTypeManager(mContext).getCommunityTypeList();
if (list != null && !list.isEmpty()) { if (list != null && !list.isEmpty()&& !StringUtil.isEmpty(list.get(0).getTalk_name())) {
typeHot = list.get(0).getTalk_name(); typeHot = list.get(0).getTalk_name();
select = list.get(0).getId(); select = list.get(0).getId();
} else { } else {