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

Merge branch 'dev_Memory' into dev_test

Browse Source 
# Conflicts:
#	app/src/main/java/com/shayu/phonelive/AppContext.java
#	common/src/main/java/com/yunbao/common/glide/ImgLoader.java
#	dependencies.gradle
#	live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java
#	live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
#	main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
#	main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
This commit is contained in:
zlzw
2022-09-22 14:43:57 +08:00
parent 24e07db6e1 c1c7c71f4a
commit ff7bfc040d
37 changed files with 319 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
View File

@@ -386,7 +386,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView.setBackgroundColor(0xffffffff);
mImageViewList.add(imageView);
ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView);
ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView,480,960);
}
for (int i = imgSize - 1; i >= 0; i--) {
mContainer.addView(mImageViewList.get(i));
@@ -544,7 +544,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
public void onDataUserInfoEvent(DataUserInfoEvent event) {
if (event.isUpDataSuccess()) {
//融云连接服务器
RongcloudIMManager.connectIM(this);
RongcloudIMManager.connectIM(getApplication());
forwardMainActivity();
} else {
releaseVideo();