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

Merge remote-tracking branch 'origin/新潘多拉_6.9.0' into 新潘多拉_6.9.0

Browse Source
This commit is contained in:
Martin 2024-07-26 18:39:54 +08:00
commit 05f1bc6e20
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,6 +220,7 @@ public class AppContext extends CommonAppContext {
} }
CrashSaveBean.getInstance().setStartTime(System.currentTimeMillis()); CrashSaveBean.getInstance().setStartTime(System.currentTimeMillis());
//注册全局异常捕获 //注册全局异常捕获
registerError(); registerError();
registerFirebaseCrash(); registerFirebaseCrash();
LogUtils.start(this); LogUtils.start(this);

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

@ -1,6 +1,7 @@
package com.yunbao.main.activity; package com.yunbao.main.activity;
import static com.yunbao.common.CommonAppContext.isReady; import static com.yunbao.common.CommonAppContext.isReady;
import static com.yunbao.common.manager.imrongcloud.RongcloudIMManager.connectIM;
import android.Manifest; import android.Manifest;
import android.animation.Animator; import android.animation.Animator;
@ -51,6 +52,7 @@ import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMSDKConfig; import com.tencent.imsdk.v2.V2TIMSDKConfig;
import com.tencent.imsdk.v2.V2TIMSDKListener; import com.tencent.imsdk.v2.V2TIMSDKListener;
import com.tencent.imsdk.v2.V2TIMUserFullInfo; import com.tencent.imsdk.v2.V2TIMUserFullInfo;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.utils.MobclickAgent;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants; import com.yunbao.common.Constants;
@ -877,13 +879,29 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
} }
private void showStartDialog() { private void showStartDialog() {
if (isReady == true) { if (isReady == true) {
MainStartDialogFragment dialogFragment = new MainStartDialogFragment(); MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
dialogFragment.setMainStartChooseCallback(true, this); dialogFragment.setMainStartChooseCallback(true, this);
dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment"); dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
} else { } else {
ToastUtil.show("正在初始化，請稍等...."); connectIM(AppManager.getInstance().getMainActivity(), new RongIMClient.ConnectCallback() {
@Override
public void onSuccess(String t) {
MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
dialogFragment.setMainStartChooseCallback(true, MainActivity.this);
dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
}
@Override
public void onError(RongIMClient.ConnectionErrorCode e) {
ToastUtil.show(R.string.net_error + "" + e.toString());
}
@Override
public void onDatabaseOpened(RongIMClient.DatabaseOpenStatus code) {
ToastUtil.show(R.string.net_error + "" + code);
}
});
} }
} }