From 923e59c7e538300d822eb7bf6d43a5465fb1743c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 十一月 2025 14:31:55 +0800
Subject: [PATCH] 2025-11-19 14:31:50

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java |   75 +++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index 19c3b8f..1e37e34 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -220,34 +220,50 @@
         });
 
         //鐢电珯娣诲姞
+        //鐐瑰嚮杩涘叆鏂伴厤缃叆缃戠晫闈�
         viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity);
-                addPowerStationDialog.show();
-                addPowerStationDialog.setCanceledOnTouchOutside(true);
-                addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
-                    @Override
-                    public void onClick(int position, String str) {
-                        addPowerStationDialog.dismiss();
-                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
-                        if (_mActivity.getString(R.string.simple_debugging).equals(str)) {
-                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
-                        } else {
-                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
-                        }
-//                        requestPermissions(new OnCallBeak() {
-//                            @Override
-//                            public void onClickCallBeak() {
-////                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
-////                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
-//                            }
-//                        });
-                    }
-                });
-
+                UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
             }
         });
+        //闀挎寜杩涘叆鏃ч厤缃叆缃戠晫闈�
+        viewBinding.addIv.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+//                AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity);
+//                addPowerStationDialog.show();
+//                addPowerStationDialog.setCanceledOnTouchOutside(true);
+//                addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() {
+//                    @Override
+//                    public void onClick(int position, String str) {
+////                        debugging_str = str;
+//                        addPowerStationDialog.dismiss();
+////                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+////                        if (_mActivity.getString(R.string.simple_debugging).equals(str)) {
+////                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION_SIMPLE, null);
+////                        } else {
+////                            HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+////                        }
+////                        requestPermissions(new OnCallBeak() {
+////                            @Override
+////                            public void onClickCallBeak() {
+//////                        UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1);
+//////                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+////                            }
+////                        });
+//                    }
+//                });
+
+                return true;
+            }
+        });
+
+
+
         //鐢电珯鎼滅储
         viewBinding.powerStationSearchClickCl.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1013,9 +1029,10 @@
             @Override
             public void onSuccess(Boolean obj) {
                 hideLoading();
-                if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
-                    initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍓嶉潰宸插厛瑙g粦浜戠閫嗗彉鍣紝mqtt閫氶亾宸叉柇寮�锛屽垵濮嬪寲鍙兘鏄湰鍦板彂閫�(鍏堟悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾)锛�
-                }
+                //纭欢閭h竟鍙柊鍥轰欢涔熷彂鍒濆鍖� 2025骞�10鏈�14鏃�10:55:18
+//                if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
+                initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍓嶉潰宸插厛瑙g粦浜戠閫嗗彉鍣紝mqtt閫氶亾宸叉柇寮�锛屽垵濮嬪寲鍙兘鏄湰鍦板彂閫�(鍏堟悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾)锛�
+//                }
                 HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//鍒犻櫎鐢电珯缂撳瓨
                 initData();//鍒濆鍖栫紦瀛樻暟鎹�
                 if (houseInfoAdapter != null) {
@@ -1062,8 +1079,8 @@
 
     public void requestPermissions(OnCallBeak onCallBeak) {
 
-        //ACCESS_FINE_LOCATION	鍏佽浣跨敤GPS瀹氫綅
-        //ACCESS_COARSE_LOCATION	鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
+        //ACCESS_FINE_LOCATION    鍏佽浣跨敤GPS瀹氫綅
+        //ACCESS_COARSE_LOCATION    鍏佽浣跨敤WIFI鐑偣鎴栧熀绔欐潵鑾峰彇绮楃暐鐨勫畾浣�
         String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
         if (ary.length > 0) {
             this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
@@ -1253,4 +1270,4 @@
     }
 
 
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0