From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
index d57aef4..b4834a7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationInputDialog.java
@@ -14,13 +14,14 @@
import androidx.constraintlayout.widget.ConstraintSet;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding;
+import com.hdl.photovoltaic.base.BaseDialog;
+import com.hdl.photovoltaic.databinding.DialogConfirmInputBinding;
import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
/**
* 杈撳叆纭妗�
*/
-public class ConfirmationInputDialog extends Dialog {
+public class ConfirmationInputDialog extends BaseDialog {
public ConfirmationInputDialog(@NonNull Context context) {
super(context, R.style.Custom_Dialog);
@@ -30,13 +31,13 @@
private final Context mContext;
private onNoOnclickListener noOnclickListener;//鍙栨秷鎸夐挳琚偣鍑讳簡鐨勭洃鍚櫒
private onYesOnclickListener yesOnclickListener;//纭畾鎸夐挳琚偣鍑讳簡鐨勭洃鍚櫒
- private LoadingConfirmInputBinding viewBinding;
- private String titleStr, yesStr, noStr;
+ private DialogConfirmInputBinding viewBinding;
+ private String titleStr, yesStr, noStr,edit_content;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- viewBinding = LoadingConfirmInputBinding.inflate(getLayoutInflater());
+ viewBinding = DialogConfirmInputBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
// setCancelable(true);//绯荤粺鍚庨��鍙互鍙栨秷
//绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
@@ -99,6 +100,22 @@
}
/**
+ * 杈撳叆妗嗗唴瀹�
+ *
+ * @param edit_content 杈撳叆妗嗗唴瀹�
+ */
+ public void setEditContent(String edit_content) {
+ if (TextUtils.isEmpty(edit_content)) {
+ return;
+ }
+ this.edit_content = edit_content;
+ if (viewBinding != null) {
+ viewBinding.loadingConfirmationInputEt.setText(edit_content);
+ }
+
+ }
+
+ /**
* 鑷畾涔�"纭"鏂囨湰
*
* @param confirm 鍐呭
@@ -151,21 +168,11 @@
}
});
-
viewBinding.loadingConfirmationClickTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- v.setSelected(!v.isSelected());
- if (v.isSelected()) {
- viewBinding.loadingConfirmationInputEt.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
- viewBinding.loadingConfirmationHideIv.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.show));
- } else {
- viewBinding.loadingConfirmationInputEt.setTransformationMethod(PasswordTransformationMethod.getInstance());
- viewBinding.loadingConfirmationHideIv.setImageDrawable(AppCompatResources.getDrawable(mContext, R.drawable.hide));
- }
- //璁剧疆鍏夋爣浣嶇疆
- viewBinding.loadingConfirmationInputEt.setSelection(viewBinding.loadingConfirmationInputEt.getText().length());
-
+ //涓�閿竻绌烘枃鏈�
+ viewBinding.loadingConfirmationInputEt.setText("");
}
});
}
@@ -189,6 +196,9 @@
if (!TextUtils.isEmpty(noStr)) {
viewBinding.dialogCancelTv.setText(noStr);
}
+ if (!TextUtils.isEmpty(edit_content)) {
+ viewBinding.loadingConfirmationInputEt.setText(edit_content);
+ }
}
private void initView() {
--
Gitblit v1.8.0