From fdcfe6ef562cc3e8bbd6fcf2faedfbd9571f4490 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 01 四月 2024 14:33:42 +0800
Subject: [PATCH] 解决小程序白屏的问题

---
 app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java |   77 +++++++++-----------------------------
 1 files changed, 18 insertions(+), 59 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 db80f22..a179bf3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/ListDialog.java
@@ -1,18 +1,11 @@
 package com.hdl.photovoltaic.widget;
 
+import android.annotation.SuppressLint;
 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,7 +21,6 @@
 import com.hdl.photovoltaic.utils.LocalManageUtil;
 import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,29 +40,13 @@
         this.mContext = context;
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        // 鑾峰彇绐楀彛瀵硅薄
-        Window dialogWindow = this.getWindow();
-        if (dialogWindow != null) {
-            // 鑾峰彇瀵硅瘽妗嗗綋鍓嶇殑鍙傛暟鍊�
-            WindowManager.LayoutParams p = dialogWindow.getAttributes();
-            p.width = LinearLayout.LayoutParams.MATCH_PARENT;
-            p.height = LinearLayout.LayoutParams.WRAP_CONTENT;
-            p.gravity = Gravity.TOP;
-            // 璁剧疆鍒板睘鎬ч厤缃腑
-            dialogWindow.setAttributes(p);
-        }
-    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         viewBinding = DialogListBinding.inflate(getLayoutInflater());
         setContentView(viewBinding.getRoot());
-        this.setCanceledOnTouchOutside(true);
-//        setDialogTouchOutsideCloseable(this);
+        setDialogTouchOutsideCloseable(this);
         initData();
         LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
         listDialogAdapter = new ListDialogAdapter(this.list, mContext);
@@ -117,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));
@@ -124,16 +101,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() {
@@ -154,40 +125,28 @@
     }
 
 
+    @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);
     }
 }

--
Gitblit v1.8.0