From da8d00e706afcff506848331ec0e58ea1ee58969 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 30 七月 2025 16:24:52 +0800 Subject: [PATCH] 2025年07月30日16:24:47 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 11 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 c3f00bd..de58c0a 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 @@ -54,9 +54,11 @@ import com.hdl.photovoltaic.utils.GPSManagerUtils; import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.photovoltaic.utils.URLEncodingUtils; +import com.hdl.photovoltaic.widget.AddPowerStationDialog; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; import com.hdl.photovoltaic.widget.DefaultFilteringDialog; import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog; +import com.hdl.photovoltaic.widget.adapter.PowerStationDialogAdapter; import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout; import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder; import com.hdl.sdk.link.common.exception.HDLLinkException; @@ -219,12 +221,26 @@ viewBinding.addIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - requestPermissions(new OnCallBeak() { + AddPowerStationDialog addPowerStationDialog = new AddPowerStationDialog(_mActivity); + addPowerStationDialog.show(); + addPowerStationDialog.setCanceledOnTouchOutside(true); + addPowerStationDialog.setItemOnclickListener(new PowerStationDialogAdapter.OnclickListener() { @Override - public void onClickCallBeak() { -// UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); -// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); + 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); +// } +// }); } }); @@ -1019,12 +1035,24 @@ if (ary.length > 0) { this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS); } else { - - UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); - HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); - locationUpdates(); - - + 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().setCurrentAppLanguage(itemData.getLanguage()); +// UserConfigManage.getInstance().Save(); + 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); + } + locationUpdates(); + } + }); } } -- Gitblit v1.8.0