Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java

@@ -1,41 +1,34 @@
package com.hdl.photovoltaic.widget;

import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
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 androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;

import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.DialogListBinding;
import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;

import java.util.ArrayList;
import java.util.List;


/**
 * 动态列表弹窗
 */
public class ListDialog extends Dialog {
public class ListDialog extends BaseDialog {
    private DialogListBinding viewBinding;

    private ListDialogAdapter listDialogAdapter;
    private final Context mContext;
    private List<ListDialogAdapter.DialogItemData> list;
    private List<LanguageAdapter.ItemData> list;

    private ListDialogAdapter.OnclickListener itemOnclickListener;//点击了的监听器

@@ -43,6 +36,7 @@
        super(context, R.style.Custom_List_Dialog);
        this.mContext = context;
    }


    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -57,13 +51,17 @@
        viewBinding.logicRcv.setAdapter(listDialogAdapter);
        listDialogAdapter.setItemOnclickListener(new ListDialogAdapter.OnclickListener() {
            @Override
            public void onClick(int position, ListDialogAdapter.DialogItemData itemData) {
            public void onClick(int position, LanguageAdapter.ItemData itemData) {
                for (int i = 0; i < list.size(); i++) {
                    ListDialogAdapter.DialogItemData data = list.get(i);
                    LanguageAdapter.ItemData data = list.get(i);
                    data.setState(false);
                }
                list.get(position).setState(true);
                listDialogAdapter.notifyDataSetChanged();
                if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(itemData.getLanguage())) {
                    //同一个不执行弹窗
                    return;
                }
                languageSelectionDialog(position, itemData);
            }
        });
@@ -75,20 +73,9 @@
    }

    private void initData() {
        list = new ArrayList<>();
        ListDialogAdapter.DialogItemData zh = new ListDialogAdapter.DialogItemData();
        zh.setState(false);
        zh.setTitle("简体中文");
        zh.setLanguage(LocalManageUtil.zh);
        list.add(zh);
        ListDialogAdapter.DialogItemData en = new ListDialogAdapter.DialogItemData();
        en.setState(false);
        en.setTitle("English");
        en.setLanguage(LocalManageUtil.en);
        list.add(en);

        list = LocalManageUtil.getLanguageList();
        for (int i = 0; i < list.size(); i++) {
            ListDialogAdapter.DialogItemData itemData = list.get(i);
            LanguageAdapter.ItemData itemData = list.get(i);
            if (itemData.getLanguage().equals(UserConfigManage.getInstance().getCurrentAppLanguage())) {
                //初始化之前状态
                itemData.setState(true);
@@ -102,7 +89,8 @@
     * @param position 索引值
     * @param itemData 选中数据
     */
    private void languageSelectionDialog(int position, ListDialogAdapter.DialogItemData 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));
@@ -110,61 +98,52 @@
        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() {
            @Override
            public void Cancel() {
                //取消之后还原之前状态
                for (int i = 0; i < list.size(); i++) {
                    LanguageAdapter.ItemData data = list.get(i);
                    data.setState(false);
                    if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(data.getLanguage())) {
                        data.setState(true);
                    }
                }
                listDialogAdapter.notifyDataSetChanged();
                dialog.dismiss();
            }
        });
    }

    //解决dialog.setCanceledOnTouchOutside(true) 不生效问题

    @SuppressLint("ClickableViewAccessibility")
    public void setDialogTouchOutsideCloseable(Dialog dialog) {
        viewBinding.getRoot().setOnTouchListener(new View.OnTouchListener() {
        viewBinding.getRoot().setOnClickListener(new View.OnClickListener() {
            @Override
            public boolean onTouch(View v, MotionEvent event) {
            public void onClick(View v) {
                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();
                    }


                int y = (int) v.getY();
                int x = (int) v.getX();
                if (top < y && y < bottom) {
                } else {
                    dismiss();
                }
                return true;
                if (left < x && x < right) {

                } else {
                    dismiss();
                }

            }
        });
//        Window window = dialog.getWindow();
//        WindowManager.LayoutParams params = window.getAttributes();
//        params.width = ViewGroup.LayoutParams.MATCH_PARENT;
//        params.height = ViewGroup.LayoutParams.MATCH_PARENT;
//        window.setAttributes(params);
//        //空白处不能取消动画
//        setCanceledOnTouchOutside(true);
    }
}