From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 02 十二月 2024 10:29:09 +0800 Subject: [PATCH] 2024年12月02日10:29:05 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | 126 ++++++++++++++++++++++++++--------------- 1 files changed, 79 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java index 33a2e71..d240831 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java @@ -14,11 +14,13 @@ import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityHouseListEditBinding; import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; +import com.hdl.photovoltaic.enums.MessageStateType; 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.ui.bean.CloudInverterDeviceBean; @@ -27,8 +29,11 @@ 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.bean.gateway.GatewayBean; import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; @@ -41,7 +46,7 @@ private ActivityHouseListEditBinding viewBinding; private HouseListAdapter houseListAdapter; - private List<HouseIdBean> houseListBeanIDList; + private List<HouseIdBean> houseListBeanIDList = new ArrayList<>(); @Override @@ -60,28 +65,38 @@ initView(); //鍒濆鍖栫晫闈㈢洃鍚櫒 initEvent(); + if (this.houseListBeanIDList.size() == 0) { + downReadData(false); + } } private void initData() { - this.houseListBeanIDList = new ArrayList<>(); + this.houseListBeanIDList.clear(); this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList()); for (int i = 0; i < this.houseListBeanIDList.size(); i++) { this.houseListBeanIDList.get(i).setDelIcon(true); this.houseListBeanIDList.get(i).setMove(true); - } + } + + + @Override + public void onBackPressed() { + super.onBackPressed(); + sendEventBus(); + } + + private void sendEventBus() { + HdlCommonLogic.getInstance().postEventBus(ConstantManage.homepage_title_tab_switch, ConstantManage.station_edit); + finish(); } private void initEvent() { //杩斿洖鎸夐挳 - viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() { + viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - BaseEventBus baseEventBus = new BaseEventBus(); - baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch); - baseEventBus.setType(HomepageTitleTabSwitch.powerstation.toString()); - EventBus.getDefault().post(baseEventBus); - finish(); + sendEventBus(); } }); @@ -99,10 +114,13 @@ houseListAdapter.setMoveOnclickListener(new HouseListAdapter.OnMoveClickListener() { @Override public void onMoveClick(int position, HouseIdBean houseIdBean) { - + if (position == 0) { + HdlThreadLogic.toast(_mActivity, getString(R.string.already_the_first_one)); + return; + } String frontHomeId = ""; - if (position > 0) { - frontHomeId = houseListBeanIDList.get(position - 1).getHomeId(); + if (position > 1) { + frontHomeId = houseListBeanIDList.get(position - 2).getHomeId(); } HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() { @Override @@ -122,7 +140,7 @@ } }); - //鐢电珯绉诲姩浣嶇疆鎸夐挳 + //鐢电珯鍒犻櫎浣嶇疆鎸夐挳 houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() { @Override public void onDelClick(int position, HouseIdBean houseIdBean) { @@ -132,12 +150,24 @@ String homeName = "\"" + houseIdBean.getHomeName() + "\""; delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", homeName)); delayedConfirmationCancelDialog.show(); - delayedConfirmationCancelDialog.startCountdown(3); + delayedConfirmationCancelDialog.startCountdown(4); delayedConfirmationCancelDialog.setYesOnclickListener(new DelayedConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { delayedConfirmationCancelDialog.dismiss(); - delete(houseIdBean.getHomeId()); + showLoading(getString(R.string.deleting_please_wait)); + HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() { + @Override + public void onSuccess(List<GatewayBean> list) { + deleteResidence(houseIdBean.getHomeId()); + initializeInverter(list); + } + + @Override + public void onFailure(HDLException e) { + deleteResidence(houseIdBean.getHomeId()); + } + }); // //鍒犻櫎浣忓畢 // HdlResidenceLogic.getInstance().delResidence(houseIdBean.getHomeId(), new CloudCallBeak<Boolean>() { // @Override @@ -169,10 +199,10 @@ } private void initView() { - viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF)); - viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE); - viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c); - viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_editing); + viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF)); + viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE); + viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c); + viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_editing); LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity); houseListAdapter = new HouseListAdapter(_mActivity); viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout); @@ -181,40 +211,31 @@ this.nullDataUpdateUi(houseListBeanIDList); } + /** * 鍒犻櫎鐢电珯,閫嗗彉鍣� - * (鍏堣幏鍙栦簯绔笂閫嗗彉鍣ㄥ垪琛�,寮�濮嬪垹闄ょ數绔欙紝鍚屾椂锛屽悜閫嗗彉鍣ㄥ彂閫佸垵濮嬪寲閫嗗彉鍣ㄦ寚浠�) + * (寮�濮嬪垹闄ょ數绔欙紝鍚屾椂锛屽悜閫嗗彉鍣ㄥ彂閫佸垵濮嬪寲閫嗗彉鍣ㄦ寚浠�,鏃犻』澶勭悊缁撴灉) * - * @param homeId 鐢电珯id + * @param list 璁惧鍒楄〃 */ - 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) { - - } - - @Override - public void onError(HDLLinkException e) { - - } - }); - } + private void initializeInverter(List<GatewayBean> list) { + if (list == null || list.size() == 0) { + return; + } + for (int i = 0; i < list.size(); i++) { + GatewayBean gatewayBean = list.get(i); + HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() { + @Override + public void onSuccess(Boolean obj) { +// HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + cloudInverterDeviceBean.getOsn(),true); } - } - @Override - public void onFailure(HDLException e) { - deleteResidence(homeId); - } - }); + @Override + public void onError(HDLLinkException e) { +// HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + cloudInverterDeviceBean.getOsn(),true); + } + }); + } } /** @@ -227,6 +248,7 @@ HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() { @Override public void onSuccess(Boolean obj) { + hideLoading(); HdlResidenceLogic.getInstance().delHouseId(homeId); initData();//鍒濆鍖栫紦瀛樻暟鎹� houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 @@ -235,6 +257,7 @@ @Override public void onFailure(HDLException e) { + hideLoading(); HdlThreadLogic.toast(_mActivity, e); } }); @@ -246,6 +269,9 @@ * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑 */ private void downReadData(boolean isRefreshing) { + if (!isRefreshing) { + showLoading(); + } //鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃 HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() { @Override @@ -256,6 +282,8 @@ if (isRefreshing) { //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦� viewBinding.fragmentHouseSrl.setRefreshing(false); + } else { + hideLoading(); } if (list != null && list.size() > 0) { //鏇存柊缂撳瓨 @@ -282,7 +310,10 @@ if (isRefreshing) { //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦� viewBinding.fragmentHouseSrl.setRefreshing(false); + } else { + hideLoading(); } + } }, _mActivity, ShowErrorMode.YES); @@ -301,6 +332,7 @@ } } + /** * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮� */ -- Gitblit v1.8.0