From a072572e098e4d5b4f0bcba87355ad032e6b0818 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 03 二月 2024 10:23:41 +0800
Subject: [PATCH] 2024年02月03日10:23:29
---
app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java | 40 ++--------------------------------------
1 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
index 291350a..a3a1223 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
@@ -4,16 +4,8 @@
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.view.Gravity;
-import android.view.MotionEvent;
import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -29,7 +21,6 @@
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -102,6 +93,7 @@
* @param itemData 閫変腑鏁版嵁
*/
private void languageSelectionDialog(int position, LanguageAdapter.ItemData itemData) {
+
ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this.mContext);
dialog.setTitle(this.mContext.getString(R.string.loading_title_tip));
dialog.setContent(this.mContext.getString(R.string.loading_app_restart));
@@ -112,9 +104,9 @@
if (itemOnclickListener != null) {
itemOnclickListener.onClick(position, itemData);
}
- dismiss();
UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
UserConfigManage.getInstance().Save();
+ dialog.dismiss();
AppManagerUtils.getAppManager().finishAllActivity();
Intent intent = new Intent();
intent.setClass(HDLApp.getInstance(), StartActivity.class);
@@ -141,34 +133,6 @@
@SuppressLint("ClickableViewAccessibility")
public void setDialogTouchOutsideCloseable(Dialog dialog) {
-// viewBinding.getRoot().setOnTouchListener(new View.OnTouchListener() {
-//
-// @Override
-// public boolean onTouch(View v, MotionEvent event) {
-// int top = viewBinding.dialogParent.getTop();
-// int left = viewBinding.dialogParent.getLeft();
-// int bottom = viewBinding.dialogParent.getBottom();
-// int right = viewBinding.dialogParent.getRight();
-// int y = (int) event.getY();
-// int x = (int) event.getX();
-// if (event.getAction() == MotionEvent.ACTION_UP) {
-// if (top < y && y < bottom) {
-//
-// } else {
-// dismiss();
-// }
-//
-// if (left < x && x < right) {
-//
-// } else {
-// dismiss();
-// }
-//
-//
-// }
-// return true;
-// }
-// });
viewBinding.getRoot().setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
--
Gitblit v1.8.0