From f96eb57f7051d52a06ec3965bbbc5ab3c0b0a3de Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 01 七月 2024 20:12:03 +0800 Subject: [PATCH] 2024年07月01日20:11:53 --- app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java | 50 ++++++-------------------------------------------- 1 files changed, 6 insertions(+), 44 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..738b438 100644 --- a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java +++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java @@ -1,19 +1,12 @@ package com.hdl.photovoltaic.widget; import android.annotation.SuppressLint; +import android.app.Activity; 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; @@ -28,9 +21,11 @@ import com.hdl.photovoltaic.utils.AppManagerUtils; import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter; +import com.jaeger.library.StatusBarUtil; -import java.util.ArrayList; import java.util.List; + +import kotlin._Assertions; /** * 鍔ㄦ�佸垪琛ㄥ脊绐� @@ -102,6 +97,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)); @@ -109,16 +105,10 @@ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { + dialog.dismiss(); if (itemOnclickListener != null) { itemOnclickListener.onClick(position, itemData); } - dismiss(); - UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage()); - UserConfigManage.getInstance().Save(); - AppManagerUtils.getAppManager().finishAllActivity(); - Intent intent = new Intent(); - intent.setClass(HDLApp.getInstance(), StartActivity.class); - mContext.startActivity(intent); } }); dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { @@ -141,34 +131,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