光环助手V3.2 DEV(20180410-1140)测试问题汇总(部分未完成)

光环助手V3.2 DEV(20180410-1140)文案优化(部分未完成)
This commit is contained in:
kehaoyuan
2018-04-11 21:31:40 +08:00
parent cdc001b43e
commit bf42834051
53 changed files with 456 additions and 398 deletions

View File

@ -327,7 +327,7 @@ public class DialogUtils {
public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfirmListener listener) {
//TODO fix this
if (!(context instanceof Activity)) {
return ;
return;
}
showWarningDialog(context, title, msg, "取消", "确定", listener, null);
}
@ -525,7 +525,7 @@ public class DialogUtils {
@Override
public void onCancel(DialogInterface dialogInterface) {
if (clListener != null)
clListener.onCancel();
clListener.onCancel();
}
});
dialog.show();
@ -671,6 +671,44 @@ public class DialogUtils {
}
public static void showSignDialog(Context context, String title, CharSequence message, CharSequence message2
, String positive, final ConfirmListener cmListener) {
final Dialog dialog = new Dialog(context);
View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_sign, null);
TextView contentTv = contentView.findViewById(R.id.dialog_content);
TextView titleTv = contentView.findViewById(R.id.dialog_title);
TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
TextView content2Tv = contentView.findViewById(R.id.dialog_content2);
contentTv.setText(Html.fromHtml(message.toString()));
content2Tv.setText(Html.fromHtml(message2.toString()));
titleTv.setText(title);
positiveTv.setText(positive);
negativeTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
dialog.dismiss();
}
});
positiveTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (cmListener != null) {
cmListener.onConfirm();
}
dialog.dismiss();
}
});
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(contentView);
dialog.show();
}
public interface ConfirmListener {
void onConfirm();
}