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

5
app/src/main/java/com/shayu/phonelive/AppContext.java
View File

@@ -4,16 +4,13 @@ import android.app.Activity;
import android.app.ActivityManager;
import android.content.Context;
import android.net.http.HttpResponseCache;
import android.os.Build;
import android.os.Bundle;
import android.os.Message;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustConfig;
@@ -50,8 +47,6 @@ import com.yunbao.main.activity.MsgSettActivity;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import io.rong.imkit.config.RongConfigCenter;

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

@@ -94,8 +94,9 @@ public class NeverCrashUtils {
if (isDebugMode()) {
Log.e(TAG, "未捕获的主线程异常行为", e);
}
e.printStackTrace();
Toast.makeText(application, "发生闪退", Toast.LENGTH_SHORT).show();
FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()),throwableToString(e),"error.log");
// FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()),throwableToString(e),"error.log");
getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e);
}
}
@@ -106,6 +107,7 @@ public class NeverCrashUtils {
if (isDebugMode()) {
Log.e(TAG, "未捕获的子线程异常行为", e);
}
e.printStackTrace();
Toast.makeText(application, "发生闪退", Toast.LENGTH_SHORT).show();
FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()),throwableToString(e),"error.log");
getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e);

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();