diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml deleted file mode 100644 index 0248071..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml deleted file mode 100644 index 0248071..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bridge.xml b/app/src/main/res/layout/activity_bridge.xml index d4642e8..c4f80d0 100644 --- a/app/src/main/res/layout/activity_bridge.xml +++ b/app/src/main/res/layout/activity_bridge.xml @@ -120,7 +120,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的情况描述" android:inputType="textMultiLine" diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml deleted file mode 100644 index 0248071..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bridge.xml b/app/src/main/res/layout/activity_bridge.xml index d4642e8..c4f80d0 100644 --- a/app/src/main/res/layout/activity_bridge.xml +++ b/app/src/main/res/layout/activity_bridge.xml @@ -120,7 +120,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index 6c23b38..519f5f9 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -245,7 +245,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的处罚描述" android:inputType="textMultiLine" diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml deleted file mode 100644 index 0248071..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bridge.xml b/app/src/main/res/layout/activity_bridge.xml index d4642e8..c4f80d0 100644 --- a/app/src/main/res/layout/activity_bridge.xml +++ b/app/src/main/res/layout/activity_bridge.xml @@ -120,7 +120,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index 6c23b38..519f5f9 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -245,7 +245,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的处罚描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_upload_common_case.xml b/app/src/main/res/layout/activity_upload_common_case.xml index 9c4e0d8..4d035d8 100644 --- a/app/src/main/res/layout/activity_upload_common_case.xml +++ b/app/src/main/res/layout/activity_upload_common_case.xml @@ -180,7 +180,7 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:layout_marginBottom="@dimen/dp_10" android:hint="请输入少于50个字的案卷情况描述" diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml deleted file mode 100644 index 0248071..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bridge.xml b/app/src/main/res/layout/activity_bridge.xml index d4642e8..c4f80d0 100644 --- a/app/src/main/res/layout/activity_bridge.xml +++ b/app/src/main/res/layout/activity_bridge.xml @@ -120,7 +120,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index 6c23b38..519f5f9 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -245,7 +245,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的处罚描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_upload_common_case.xml b/app/src/main/res/layout/activity_upload_common_case.xml index 9c4e0d8..4d035d8 100644 --- a/app/src/main/res/layout/activity_upload_common_case.xml +++ b/app/src/main/res/layout/activity_upload_common_case.xml @@ -180,7 +180,7 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:layout_marginBottom="@dimen/dp_10" android:hint="请输入少于50个字的案卷情况描述" diff --git a/app/src/main/res/layout/activity_upload_package_case.xml b/app/src/main/res/layout/activity_upload_package_case.xml index d390442..600df1b 100644 --- a/app/src/main/res/layout/activity_upload_package_case.xml +++ b/app/src/main/res/layout/activity_upload_package_case.xml @@ -175,7 +175,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的案卷情况描述" android:inputType="textMultiLine" diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml deleted file mode 100644 index 0248071..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bridge.xml b/app/src/main/res/layout/activity_bridge.xml index d4642e8..c4f80d0 100644 --- a/app/src/main/res/layout/activity_bridge.xml +++ b/app/src/main/res/layout/activity_bridge.xml @@ -120,7 +120,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index 6c23b38..519f5f9 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -245,7 +245,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的处罚描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_upload_common_case.xml b/app/src/main/res/layout/activity_upload_common_case.xml index 9c4e0d8..4d035d8 100644 --- a/app/src/main/res/layout/activity_upload_common_case.xml +++ b/app/src/main/res/layout/activity_upload_common_case.xml @@ -180,7 +180,7 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:layout_marginBottom="@dimen/dp_10" android:hint="请输入少于50个字的案卷情况描述" diff --git a/app/src/main/res/layout/activity_upload_package_case.xml b/app/src/main/res/layout/activity_upload_package_case.xml index d390442..600df1b 100644 --- a/app/src/main/res/layout/activity_upload_package_case.xml +++ b/app/src/main/res/layout/activity_upload_package_case.xml @@ -175,7 +175,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的案卷情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_upload_quick_case.xml b/app/src/main/res/layout/activity_upload_quick_case.xml index 29e3d15..11a5997 100644 --- a/app/src/main/res/layout/activity_upload_quick_case.xml +++ b/app/src/main/res/layout/activity_upload_quick_case.xml @@ -180,7 +180,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的案卷情况描述" android:inputType="textMultiLine" diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f93655..13bc9ef 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,10 +8,16 @@ + + + + + + @@ -25,6 +31,7 @@ + @@ -51,7 +58,9 @@ + + diff --git a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java index eb6e31a..6b43c12 100644 --- a/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java +++ b/app/src/main/java/com/casic/dcms/widgets/CancelAlarmDialog.java @@ -7,26 +7,27 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; +import android.widget.Button; import android.widget.Spinner; -import android.widget.TextView; import com.casic.dcms.R; import com.casic.dcms.utils.LocaleConstant; +import com.pengxh.androidx.lite.utils.DialogLayoutParam; +import com.pengxh.androidx.lite.widget.DeleteEditText; import com.pengxh.androidx.lite.widget.EasyToast; -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton; public class CancelAlarmDialog extends Dialog implements View.OnClickListener { private static final String TAG = "CancelAlarmDialog"; private final Context context; private final OnDialogButtonClickListener listener; - private EditText cancelReasonView; + private DeleteEditText cancelReasonView; private String status; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + DialogLayoutParam.resetParams(this, 0.85); setContentView(R.layout.dialog_cancel_alarm); Spinner reasonSpinner = findViewById(R.id.selectReasonView); @@ -36,15 +37,10 @@ cancelReasonView = findViewById(R.id.cancelReasonView); - TextView closeDialogView = findViewById(R.id.closeDialogView); - closeDialogView.setOnClickListener(this); - - QMUIRoundButton dialogCancelButton = findViewById(R.id.dialogCancelButton); - dialogCancelButton.setChangeAlphaWhenPress(true); + Button dialogCancelButton = findViewById(R.id.dialogCancelButton); dialogCancelButton.setOnClickListener(this); - QMUIRoundButton dialogConfirmButton = findViewById(R.id.dialogConfirmButton); - dialogConfirmButton.setChangeAlphaWhenPress(true); + Button dialogConfirmButton = findViewById(R.id.dialogConfirmButton); dialogConfirmButton.setOnClickListener(this); reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -80,8 +76,6 @@ } listener.onConfirmClick(status, editReason); } - } else if (i == R.id.closeDialogView) { - listener.onCancelClick(); } this.dismiss(); } diff --git a/app/src/main/res/drawable/bg_layout_spinner.xml b/app/src/main/res/drawable/bg_layout_spinner.xml new file mode 100644 index 0000000..e927ebb --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_spinner.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml new file mode 100644 index 0000000..3543912 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_hint_radius_3.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml new file mode 100644 index 0000000..0248071 --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_layout_back_radius_3.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml b/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml deleted file mode 100644 index 0248071..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_radius_3.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bridge.xml b/app/src/main/res/layout/activity_bridge.xml index d4642e8..c4f80d0 100644 --- a/app/src/main/res/layout/activity_bridge.xml +++ b/app/src/main/res/layout/activity_bridge.xml @@ -120,7 +120,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_package_todo.xml b/app/src/main/res/layout/activity_package_todo.xml index 6c23b38..519f5f9 100644 --- a/app/src/main/res/layout/activity_package_todo.xml +++ b/app/src/main/res/layout/activity_package_todo.xml @@ -245,7 +245,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的处罚描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_upload_common_case.xml b/app/src/main/res/layout/activity_upload_common_case.xml index 9c4e0d8..4d035d8 100644 --- a/app/src/main/res/layout/activity_upload_common_case.xml +++ b/app/src/main/res/layout/activity_upload_common_case.xml @@ -180,7 +180,7 @@ android:id="@+id/caseDetailEditView" style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:layout_marginBottom="@dimen/dp_10" android:hint="请输入少于50个字的案卷情况描述" diff --git a/app/src/main/res/layout/activity_upload_package_case.xml b/app/src/main/res/layout/activity_upload_package_case.xml index d390442..600df1b 100644 --- a/app/src/main/res/layout/activity_upload_package_case.xml +++ b/app/src/main/res/layout/activity_upload_package_case.xml @@ -175,7 +175,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的案卷情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/activity_upload_quick_case.xml b/app/src/main/res/layout/activity_upload_quick_case.xml index 29e3d15..11a5997 100644 --- a/app/src/main/res/layout/activity_upload_quick_case.xml +++ b/app/src/main/res/layout/activity_upload_quick_case.xml @@ -180,7 +180,7 @@ style="@style/inputEditTextStyle" android:layout_marginHorizontal="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" - android:background="@drawable/bg_stroke_layout_radius_3" + android:background="@drawable/bg_stroke_layout_back_radius_3" android:gravity="top" android:hint="请输入少于50个字的案卷情况描述" android:inputType="textMultiLine" diff --git a/app/src/main/res/layout/dialog_cancel_alarm.xml b/app/src/main/res/layout/dialog_cancel_alarm.xml index 42c50ad..d693b1b 100644 --- a/app/src/main/res/layout/dialog_cancel_alarm.xml +++ b/app/src/main/res/layout/dialog_cancel_alarm.xml @@ -1,100 +1,106 @@ - + android:layout_height="wrap_content" + android:elevation="@dimen/dp_10" + app:cardCornerRadius="@dimen/dp_10"> - - - + android:background="@color/lib_dialog_bg_color" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="@dimen/titleViewHeight" + android:gravity="center" + android:paddingHorizontal="@dimen/dp_10" + android:text="取消告警" + android:textSize="@dimen/sp_16" /> + android:layout_height="@dimen/itemLayoutHeight" + android:gravity="center_vertical"> - + + + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/dp_10" + android:background="@drawable/bg_layout_spinner"> + + + - - - - - - - + android:layout_height="@dimen/itemLayoutHeight" + android:gravity="center_vertical"> - + - + + - - - \ No newline at end of file + + + + +