From 89c38fa6f118d56cb163c245905de8f1c0a75a7c Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 19 三月 2024 18:03:50 +0800 Subject: [PATCH] 2024年03月19日18:03:44 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 202 +++++++++++++++++++++++++++---------------------- 1 files changed, 111 insertions(+), 91 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java index 957a31c..c572a71 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java @@ -2,6 +2,7 @@ import android.Manifest; import android.content.Context; +import android.content.Intent; import android.content.pm.PackageManager; import android.hardware.camera2.CameraManager; import android.os.Bundle; @@ -20,15 +21,21 @@ import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; import com.hdl.photovoltaic.enums.ShowErrorMode; import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.listener.LinkCallBack; import com.hdl.photovoltaic.other.HdlCommonLogic; +import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.other.HdlUniLogic; +import com.hdl.photovoltaic.ui.MyPowerStationActivity; import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter; +import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean; import com.hdl.photovoltaic.ui.bean.HouseIdBean; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.PermissionUtils; +import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog; +import com.hdl.sdk.link.common.exception.HDLLinkException; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; @@ -39,7 +46,6 @@ * (浣忓畢)鐢电珯鍒楄〃-鐣岄潰 */ public class HouseListFragment extends CustomBaseFragment { - private boolean is_edit = false; private FragmentHouseListBinding viewBinding; private HouseInfoAdapter houseInfoAdapter; private CameraManager manager; @@ -65,39 +71,12 @@ private void initEvent() { - viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (is_edit) { - is_edit = false; - } - viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.GONE); - initData();//鍒濆鍖栫紦瀛樻暟鎹� - setAllItemEdit(false); - houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 - } - }); + //娣诲姞鐢电珯 viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); -// requestPermissions(new PermissionsResultCallback() { -// @Override -// public void succeed() { -//// Intent intent = new Intent(); -//// intent.setClass(_mActivity, FastScanActivity.class); -//// startActivity(intent); -//// // 鎵撳紑灏忕▼搴忛〉闈� -// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); -// } -// -// @Override -// public void failing() { -// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); -// } -// }); - } }); @@ -107,7 +86,6 @@ @Override public void onRefresh() { downReadData(true); - HdlLogLogic.print("HouseListFragment涓嬫媺鍒锋柊", false); } }); //杩涘叆鐢电珯璇︽儏,鍒犻櫎鐢电珯,绉诲姩鐢电珯浣嶇疆 @@ -117,52 +95,57 @@ //鐐瑰嚮浣忓畢璇︽儏 HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏--->" + new Gson().toJson(houseIdBean), false); HdlResidenceLogic.getInstance().switchHouse(houseIdBean); - String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS - + "?homeId=" + houseIdBean.getHomeId() - + "&homeName=" + houseIdBean.getHomeName() - + "&powerStationStatus=" + houseIdBean.getPowerStationStatus(); + String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus(); HdlUniLogic.getInstance().openUniMP(path, null); } @Override public void onMoveClick(int position, HouseIdBean houseIdBean) { + String frontHomeId = ""; if (position > 0) { - houseInfoAdapter.notifyItemMoved(position - 1, position); + frontHomeId = houseListBeanIDList.get(position - 1).getHomeId(); } -// //绉诲姩鐢电珯浣嶇疆 -// HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId()); -// initData();//鍒濆鍖栫紦瀛樻暟鎹� -// houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 -// nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌� + HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + //绉诲姩鐢电珯浣嶇疆 + HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId()); + initData();//鍒濆鍖栫紦瀛樻暟鎹� + houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 + nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌� + } + + @Override + public void onFailure(HDLException e) { + HdlThreadLogic.toast(_mActivity, e); + } + }); + } @Override public void onDelClick(int position, HouseIdBean houseIdBean) { - - HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId()); - initData();//鍒濆鍖栫紦瀛樻暟鎹� - houseInfoAdapter.notifyItemRemoved(position); - -// DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity); -// delayedConfirmationCancelDialog.setTitle(R.string.loading_title_tip); -// delayedConfirmationCancelDialog.setContent("鏄惁纭鍒犻櫎鐢电珯?"); -// delayedConfirmationCancelDialog.show(); -// delayedConfirmationCancelDialog.startCountdown(3); -// delayedConfirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { -// @Override -// public void Confirm() { + DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity); + delayedConfirmationCancelDialog.setTitleContent(getString(R.string.loading_title_tip)); + String homeName = "\"" + houseIdBean.getHomeName() + "\""; + delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName)); + delayedConfirmationCancelDialog.show(); + delayedConfirmationCancelDialog.startCountdown(3); + delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() { + @Override + public void Confirm() { + delayedConfirmationCancelDialog.dismiss(); + delete(houseIdBean.getHomeId()); // //鍒犻櫎浣忓畢 // HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() { // @Override // public void onSuccess(Boolean obj) { // HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId()); // initData();//鍒濆鍖栫紦瀛樻暟鎹� -// setAllItemEdit(is_edit); // houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 // nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌� -// delayedConfirmationCancelDialog.dismiss(); // } // // @Override @@ -170,14 +153,14 @@ // HdlThreadLogic.toast(_mActivity, e); // } // }); -// } -// }); -// delayedConfirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { -// @Override -// public void Cancel() { -// delayedConfirmationCancelDialog.dismiss(); -// } -// }); + } + }); + delayedConfirmationCancelDialog.setNoOnclickListener(new DelayedConfirmationCancelDialog.onNoOnclickListener() { + @Override + public void Cancel() { + delayedConfirmationCancelDialog.dismiss(); + } + }); } }); @@ -186,18 +169,7 @@ viewBinding.toolbarTopFragmentHouseListRl.topEditIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (is_edit) { - //闃叉澶氭鐐瑰嚮 - return; - } - is_edit = true; - viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE); - if (houseInfoAdapter == null) { - return; - } - initData();//鍒濆鍖栫紦瀛樻暟鎹� - setAllItemEdit(true); - houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 + startActivity(HouseListEditActivity.class); } }); } @@ -269,6 +241,7 @@ } } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getType())) { + //uin鍏抽棴浣忓畢璇︽儏鐣岄潰閫氱煡 if (MqttRecvClient.getInstance() != null) { MqttRecvClient.getInstance().removeAllTopic(); @@ -288,21 +261,12 @@ //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢 if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) { HdlLogLogic.print("姝e湪鐐瑰嚮銆愮數绔欍��"); + initData();//鍒濆鍖栫紦瀛樻暟鎹� + houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 } } } - - /** - * 璁剧疆鍏ㄩ儴缂撳瓨鏁版嵁缂栬緫鐘舵�� - * - * @param edit true琛ㄧず鍦ㄧ紪杈戠姸鎬� - */ - private void setAllItemEdit(boolean edit) { - for (int i = 0; i < houseListBeanIDList.size(); i++) { - houseListBeanIDList.get(i).setEdit(edit); - } - } /** * 鍒锋柊UI @@ -326,7 +290,6 @@ HdlResidenceLogic.getInstance().setHouseIdList(list); if (houseInfoAdapter != null) { initData(); - setAllItemEdit(is_edit); //鏇存柊UI houseInfoAdapter.setList(houseListBeanIDList); } @@ -353,6 +316,7 @@ } }); } + /** * 鐢宠鏉冮檺 @@ -408,10 +372,66 @@ * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮� */ private void nullDataUpdateUi(List<HouseIdBean> list) { - HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, - viewBinding.nullDataIc.getRoot(), - viewBinding.nullDataIc.nullDataGifAnimationIv, - viewBinding.nullDataIc.nullDataTv, getString(R.string.my_power_station_data_null), list != null && list.size() > 0); + HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.nullDataIc.getRoot(), viewBinding.nullDataIc.nullDataGifAnimationIv, viewBinding.nullDataIc.nullDataTv, getString(R.string.my_power_station_data_null), list != null && list.size() > 0); + } + + /** + * 鍒犻櫎鐢电珯,閫嗗彉鍣� + * (鍏堣幏鍙栦簯绔笂閫嗗彉鍣ㄥ垪琛�,寮�濮嬪垹闄ょ數绔欙紝鍚屾椂锛屽悜閫嗗彉鍣ㄥ彂閫佸垵濮嬪寲閫嗗彉鍣ㄦ寚浠�) + * + * @param homeId 鐢电珯id + */ + private void delete(String homeId) { + HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() { + @Override + public void onSuccess(List<CloudInverterDeviceBean> list) { + deleteResidence(homeId); + if (list != null) { + for (int i = 0; i < list.size(); i++) { + CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i); + HdlDeviceLogic.getInstance().initializeGateway(cloudInverterDeviceBean.getOsn(), new LinkCallBack<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + cloudInverterDeviceBean.getOsn()); + } + + @Override + public void onError(HDLLinkException e) { + HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + cloudInverterDeviceBean.getOsn()); + } + }); + } + } + } + + @Override + public void onFailure(HDLException e) { + deleteResidence(homeId); + } + }); + } + + /** + * 鍒犻櫎鐢电珯 + * + * @param homeId 鐢电珯id + */ + private void deleteResidence(String homeId) { + //鍒犻櫎浣忓畢 + HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() { + @Override + public void onSuccess(Boolean obj) { + HdlResidenceLogic.getInstance().delHouseId(homeId); + initData();//鍒濆鍖栫紦瀛樻暟鎹� + houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 + nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌� + } + + @Override + public void onFailure(HDLException e) { + HdlThreadLogic.toast(_mActivity, e); + } + }); } -- Gitblit v1.8.0