Merge remote-tracking branch 'origin/dev_lyr' into dev_4.2.0

# Conflicts:
#	app/src/main/java/com/gh/common/constant/Constants.java
#	dependencies.gradle
This commit is contained in:
chenjuntao
2020-08-19 17:45:17 +08:00
69 changed files with 2185 additions and 248 deletions

View File

@ -1528,6 +1528,23 @@ public class DialogUtils {
dialog.show();
}
public static void showSamePhoneDialog(Context context, @NonNull ConfirmListener listener) {
context = checkDialogContext(context);
final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_same_phone, null);
contentView.findViewById(R.id.dialog_ok).setOnClickListener(v -> {
listener.onConfirm();
dialog.dismiss();
});
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(contentView);
dialog.show();
}
/**
* @param context may be is application context
* @return activity context