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

Merge branch 'master' into dev_6.5.4_tmp

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
zlzw
2023-08-04 15:41:11 +08:00
parent fe921e25bb 45c256cbbb
commit bf8d88608d
203 changed files with 9611 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,9 +164,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private MainHomeViewHolder mainHomeViewHolder;
private MainHomeCommunityViewHolder mMainHomeCommunityViewHolder;
private MainMessageViewHolder mainMessageViewHolder;
private MainHomeVideoViewHolder mainHomeVideoViewHolder;
private MainHomeShopViewHolder mListShopViewHolder;
private ChatListViewHolder mChatListViewHolder;
private MainMeViewHolder mMeViewHolder;
private AbsMainViewHolder[] mViewHolders;
private View mBottom;