yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugly bugfix

Browse Source
This commit is contained in:
huangjian
2023-01-05 16:39:21 +08:00
parent 3561ef6548
commit 16ad837559
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java
View File

@@ -286,7 +286,7 @@ public class DialogManager {
// return;
//加上一个try，强行吞异常
try {
if (mContext != null && mDialog != null && mDialog.getWindow() != null) {
if ( mDialog != null && mDialog.getWindow() != null) {
if (mContext instanceof Activity) {
Activity activity = (Activity) mContext;
if (!activity.isFinishing()) {
@@ -394,7 +394,7 @@ public class DialogManager {
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = new CommonPopupDialog(mContext, title, btnItems, bottomButton);
mDialog.setCancelable(mCanceledOnClickBackKey);
@@ -410,7 +410,7 @@ public class DialogManager {
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = new CommonPopupDialog(mContext, title, btnItems, cancelBtnText, isFullScreen);
mDialog.setCancelable(mCanceledOnClickBackKey);
@@ -426,7 +426,7 @@ public class DialogManager {
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = new CommonPopupDialog(mContext, title, btnItems, cancelBtnText);
mDialog.setCancelable(mCanceledOnClickBackKey);
@@ -440,7 +440,7 @@ public class DialogManager {
return;
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = new CustomPopupDialog(mContext, title, btnItems);
mDialog.setCancelable(mCanceledOnClickBackKey);
@@ -454,7 +454,7 @@ public class DialogManager {
return;
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = new CommonPopupDialog(id, mContext, title, btnItems, bottomButton);
mDialog.setCancelable(mCanceledOnClickBackKey);
@@ -582,7 +582,7 @@ public class DialogManager {
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
mDialog.show();
@@ -603,7 +603,7 @@ public class DialogManager {
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
mDialog.show();
@@ -674,7 +674,7 @@ public class DialogManager {
return;
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
@@ -686,7 +686,7 @@ public class DialogManager {
TextView view = window.findViewById(R.id.tv_msg);
view.setText(msg);
window.setGravity(Gravity.CENTER);
window.findViewById(R.id.tv_iknow).setOnClickListener(v -> mDialog.dismiss());
window.findViewById(R.id.tv_iknow).setOnClickListener(v -> dismissDialog());
}
public void showLuckyMoneyConfirmToPayDialog(String amount, String fee, String coinName, View.OnClickListener listener) {
@@ -695,7 +695,7 @@ public class DialogManager {
return;
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
mDialog.setCancelable(false);
@@ -714,10 +714,10 @@ public class DialogManager {
feeTextView.setText(fee);
TextView feeCoinName = window.findViewById(R.id.tv_lucky_money_fee_coin_name);
feeCoinName.setText(coinName);
window.findViewById(R.id.iv_close).setOnClickListener(v -> mDialog.dismiss());
window.findViewById(R.id.iv_close).setOnClickListener(v -> dismissDialog());
Button btn = window.findViewById(R.id.btn_ready_to_pay);
btn.setOnClickListener(v -> {
mDialog.dismiss();
dismissDialog();
listener.onClick(v);
});
}
@@ -729,7 +729,7 @@ public class DialogManager {
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
@@ -751,7 +751,7 @@ public class DialogManager {
TextView ok = window.findViewById(R.id.btn_ok);
ok.setOnClickListener(v -> {
mDialog.dismiss();
dismissDialog();
if (l != null) {
l.onOk();
}
@@ -759,7 +759,7 @@ public class DialogManager {
TextView cancel = window.findViewById(R.id.btn_cancel);
cancel.setOnClickListener(v -> {
mDialog.dismiss();
dismissDialog();
if (l != null) {
l.onCancel();
}
@@ -772,7 +772,7 @@ public class DialogManager {
return;
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
mDialog.show();
@@ -787,7 +787,7 @@ public class DialogManager {
return;
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
mDialog.show();
@@ -842,7 +842,7 @@ public class DialogManager {
}
if (mDialog.isShowing()) {
mDialog.dismiss();
dismissDialog();
}
mDialog = mBuilder.create();
@@ -861,7 +861,7 @@ public class DialogManager {
}
ok.setOnClickListener(v -> {
if (isAutoHide) {
mDialog.dismiss();
dismissDialog();
}
if (l != null) {
l.onOk();
@@ -873,7 +873,7 @@ public class DialogManager {
cancel.setText(cancelLabel);
cancel.setOnClickListener(v -> {
if (isAutoHide) {
mDialog.dismiss();
dismissDialog();
}
if (l != null) {
l.onCancel();
@@ -1012,7 +1012,7 @@ public class DialogManager {
if (resultCode.equals(input.getText().toString())) {
if (listener != null) {
listener.onConfirm();
mDialog.dismiss();
dismissDialog();
}
} else {
failMsg.setVisibility(View.VISIBLE);
@@ -1025,7 +1025,7 @@ public class DialogManager {
mCancel.setOnClickListener(v -> {
if (listener != null) {
listener.onCancel();
mDialog.dismiss();
dismissDialog();
}
});
}

4
app/src/main/java/com/mango/moshen/ui/relation/FansListFragment.java
View File

@@ -164,7 +164,9 @@ public class FansListFragment extends BaseFragment {
).subscribe(new SingleObserver<FansListInfo>() {
@Override
public void onSubscribe(Disposable d) {
mCompositeDisposable.add(d);
if (mCompositeDisposable != null) {
mCompositeDisposable.add(d);
}
}
@Override