Merge branch 'kk' into dev_MogoAP_eagle-930_210926_8.0.12

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java

@@ -159,7 +159,7 @@ public class VehicleMonitoringManager implements ICheckProvider {
                     AppUtils.isAppRunning(getPackageName(context)) &&
                     ActivityUtils.getTopActivity() instanceof CheckActivity == false) {
                 if (dialog != null) {
-                    dialog.cancel();
+                    dialog.dismiss();
                 }
                 dialog = new CheckDialog(context, true);
                 dialog.show();

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java

@@ -40,11 +40,11 @@ public class CheckDialog extends BaseFloatDialog {
         setContentView(R.layout.check_dialog);
         cancel = findViewById(R.id.cancel_button);
         cancel.setOnClickListener(v -> {
-            cancel();
+            dismiss();
         });
         checkDetail = findViewById(R.id.check_detail);
         checkDetail.setOnClickListener(v -> {
-            cancel();
+            dismiss();
             if (mContext != null) {
                 CallerCheckManager.startCheckActivity(mContext);
             }
@@ -63,11 +63,11 @@ public class CheckDialog extends BaseFloatDialog {
 
 
     public void cancel() {
-        super.dismiss();
+
     }
 
     @Override
     public void dismiss() {
-
+        super.dismiss();
     }
 }

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java

@@ -71,7 +71,7 @@ public class CheckInfoListDialog extends BaseFloatDialog {
         mRecyclerView.setAdapter(new CheckInfoAdapter(mContext, mStyle, resultData));
         //关闭按钮
         findViewById(R.id.cancel_info_list_button).setOnClickListener(v -> {
-            cancel();
+            dismiss();
         });
     }
 
@@ -106,11 +106,11 @@ public class CheckInfoListDialog extends BaseFloatDialog {
     }
 
     public void cancel() {
-        super.dismiss();
+
     }
 
     @Override
     public void dismiss() {
-
+        super.dismiss();
     }
 }