yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liujing
2021-09-28 09:07:11 +08:00
parent 3a0991b29b b5b2cb4ae7
commit 0a4d2f5f04
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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