feat: 优化

app/src/main/java/com/huntersun/vkyes/etcopencard/project/dialog/ConfirmDialog.java

@@ -18,7 +18,6 @@ public class ConfirmDialog {
     public static final class Builder extends com.huntersun.vkyes.etcopencard.src.ui.dialog.CommonDialog.Builder<ConfirmDialog.Builder> implements ToastAction {
         private final android.content.Context Context;
         private ImageView ivIcon;
-        private ImageView ivClose;
         private TextView tvMsg;
         private Button btnConfirm;
         private TextView tvCancel;
@@ -63,7 +62,7 @@ public class ConfirmDialog {
 
         public ConfirmDialog.Builder setMsg(String msg, int icon){
             tvMsg.setText(msg);
-            ivClose.setImageDrawable(getResources().getDrawable(icon));
+            ivIcon.setImageDrawable(getResources().getDrawable(icon));
             return this;
         }
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/OrderUtils.java

@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import com.alibaba.fastjson.JSON;
 import com.huntersun.vky.obublelib.box.BoxManagers;
 import com.huntersun.vky.obublelib.util.ToastUtil;
+import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.bluetooth.BluetoothDialog;
 import com.huntersun.vkyes.etcopencard.project.copapply.ApplyRequst;
@@ -228,7 +229,7 @@ public class OrderUtils {
         btnFinish.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                new ConfirmDialog.Builder(context) .setMsg("确定是否结束订单?").onClick(new ConfirmDialog.Result() {
+                new ConfirmDialog.Builder(context) .setMsg("确定是否结束订单?", R.mipmap.icon_finish_order).onClick(new ConfirmDialog.Result() {
                             @Override
                             public void confirm() {
                                 ToastUtil.showS(context,"结束订单");
@@ -306,7 +307,7 @@ public class OrderUtils {
         btnAgainActive.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                new ConfirmDialog.Builder(context) .setMsg("确定是否再次唤醒订单?").onClick(new ConfirmDialog.Result() {
+                new ConfirmDialog.Builder(context) .setMsg("确定是否再次唤醒订单?",R.mipmap.icon_active_order).onClick(new ConfirmDialog.Result() {
                     @Override
                     public void confirm() {
                         ToastUtil.showS(context,"再次唤起");

app/src/main/res/layout-v2/fragment_home_three.xml

@@ -38,7 +38,7 @@
                 android:minWidth="@dimen/dp_80"
                 android:paddingLeft="@dimen/dp_10"
                 android:paddingRight="@dimen/dp_10"
-                android:text="新版订单"
+                android:text="新办订单"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_14" />