From 7c2dce60eeb3b3b54c52890ece8aa472d5512a04 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 11 三月 2024 16:03:49 +0800 Subject: [PATCH] 2024年03月11日16:03:42 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 145 +++++++++++++++++++++++++----------------------- 1 files changed, 76 insertions(+), 69 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..e93297e 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; @@ -27,8 +28,11 @@ import com.hdl.photovoltaic.other.HdlUniLogic; import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter; import com.hdl.photovoltaic.ui.bean.HouseIdBean; +import com.hdl.photovoltaic.ui.newC.MessageCenterList; +import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.PermissionUtils; +import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient; @@ -81,22 +85,12 @@ 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); -// } -// }); +// resumeTagStatus(); +// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); + + Intent intent = new Intent(); + intent.setClass(_mActivity, MessageCenterList.class); + startActivity(intent); } @@ -107,77 +101,80 @@ @Override public void onRefresh() { downReadData(true); - HdlLogLogic.print("HouseListFragment涓嬫媺鍒锋柊", false); } }); //杩涘叆鐢电珯璇︽儏,鍒犻櫎鐢电珯,绉诲姩鐢电珯浣嶇疆 houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() { @Override public void onClick(int position, HouseIdBean houseIdBean) { + resumeTagStatus(); //鐐瑰嚮浣忓畢璇︽儏 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) { - if (position > 0) { - houseInfoAdapter.notifyItemMoved(position - 1, position); - } -// //绉诲姩鐢电珯浣嶇疆 -// HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId()); -// initData();//鍒濆鍖栫紦瀛樻暟鎹� -// houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 -// nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌� +// HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), 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() { -// //鍒犻櫎浣忓畢 -// 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 -// public void onFailure(HDLException e) { -// HdlThreadLogic.toast(_mActivity, e); -// } -// }); -// } -// }); -// delayedConfirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { -// @Override -// public void Cancel() { -// delayedConfirmationCancelDialog.dismiss(); -// } -// }); + 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("XX", homeName)); + delayedConfirmationCancelDialog.show(); + delayedConfirmationCancelDialog.startCountdown(3); + delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() { + @Override + public void Confirm() { + //鍒犻櫎浣忓畢 + 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 + public void onFailure(HDLException e) { + HdlThreadLogic.toast(_mActivity, e); + } + }); + } + }); + delayedConfirmationCancelDialog.setNoOnclickListener(new DelayedConfirmationCancelDialog.onNoOnclickListener() { + @Override + public void Cancel() { + delayedConfirmationCancelDialog.dismiss(); + } + }); } }); @@ -269,6 +266,7 @@ } } else if (HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE.equals(eventBus.getType())) { + //uin鍏抽棴浣忓畢璇︽儏鐣岄潰閫氱煡 if (MqttRecvClient.getInstance() != null) { MqttRecvClient.getInstance().removeAllTopic(); @@ -288,6 +286,10 @@ //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢 if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) { HdlLogLogic.print("姝e湪鐐瑰嚮銆愮數绔欍��"); + resumeTagStatus(); + initData();//鍒濆鍖栫紦瀛樻暟鎹� + setAllItemEdit(false); + houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 } } } @@ -355,6 +357,14 @@ } /** + * 鎭㈠鍒版湭缂栬緫鐢电珯鐘舵�� + */ + private void resumeTagStatus() { + is_edit = false; //杩樺師缂栬緫鏍囪 + viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.GONE);//闅愯棌鍚庨��鍥炬爣 + } + + /** * 鐢宠鏉冮檺 */ private void requestPermissions(PermissionsResultCallback permissionsResultCallback) { @@ -408,10 +418,7 @@ * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮� */ 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); } -- Gitblit v1.8.0