From 89d140a2ca1b27edad1c561347a00ce6561e12bd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 17 十一月 2025 17:05:21 +0800
Subject: [PATCH] Merge branch 'dev' into 1.4.4
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 40 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 5e2d0cc..5801f16 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
@@ -223,29 +223,40 @@
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);
+// 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);
-//// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
-// }
-// });
- }
- });
+//// 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);
+//// }
+//// });
+// }
+// });
+ }
+ });
+ 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_SIMPLE, null);
+ return true;
}
});
//鐢电珯鎼滅储
@@ -346,8 +357,11 @@
houseIdBean.setDebugStatus(DebugStatus.Debugging);
HdlResidenceLogic.getInstance().updateHouseIdBean(houseIdBean);
initData();
+ if (houseInfoAdapter != null) {
+ houseInfoAdapter.setList(houseListBeanIDList, powerStationStatusValue);//閲嶆柊鍒锋柊鍒楄〃
+ }
//鏇存柊UI
- houseInfoAdapter.notifyItemChanged(position);
+// houseInfoAdapter.notifyItemChanged(position);
}
}
@@ -358,20 +372,26 @@
});
} else {
showLoading(getString(R.string.deleting_please_wait));
- HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
- @Override
- public void onSuccess(List<GatewayBean> list) {
- //鍙戣捣鍒犻櫎鐢电珯鎸囦护
- deleteResidence(position, houseIdBean, list);
+ if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
+ //銆愬父瑙勬柟寮忋�戝彂璧峰垹闄ょ數绔欐寚浠�
+ HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
+ @Override
+ public void onSuccess(List<GatewayBean> list) {
+ //鍙戣捣鍒犻櫎鐢电珯鎸囦护
+ deleteResidence(position, houseIdBean, list);
- }
+ }
- @Override
- public void onFailure(HDLException e) {
- //鍙戣捣鍒犻櫎鐢电珯鎸囦护
- deleteResidence(position, houseIdBean, null);
- }
- });
+ @Override
+ public void onFailure(HDLException e) {
+ //鍙戣捣鍒犻櫎鐢电珯鎸囦护
+ deleteResidence(position, houseIdBean, null);
+ }
+ });
+ } else {
+ //銆愮畝鏄撴柟寮忋�戝彂璧峰垹闄ょ數绔欐寚浠�
+ deleteResidence(position, houseIdBean, null);
+ }
}
}
});
@@ -1004,9 +1024,10 @@
@Override
public void onSuccess(Boolean obj) {
hideLoading();
- if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
- initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍓嶉潰宸插厛瑙ｇ粦浜戠閫嗗彉鍣紝mqtt閫氶亾宸叉柇寮�锛屽垵濮嬪寲鍙兘鏄湰鍦板彂閫�(鍏堟悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾)锛�
- }
+ //纭欢閭ｈ竟鍙柊鍥轰欢涔熷彂鍒濆鍖� 2025骞�10鏈�14鏃�10:55:18
+// if (houseIdBean.getDebugType().equals(DebugType.NORMAL)) {
+ initializeInverter(list); //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;锛堟敞鎰�:鍓嶉潰宸插厛瑙ｇ粦浜戠閫嗗彉鍣紝mqtt閫氶亾宸叉柇寮�锛屽垵濮嬪寲鍙兘鏄湰鍦板彂閫�(鍏堟悳绱㈠眬鍩熺綉閫嗗彉鍣ㄥ垪琛紝寤虹珛鏈湴閫氳閫氶亾)锛�
+// }
HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());//鍒犻櫎鐢电珯缂撳瓨
initData();//鍒濆鍖栫紦瀛樻暟鎹�
if (houseInfoAdapter != null) {
@@ -1053,8 +1074,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);
@@ -1244,4 +1265,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0