From 3ccff7173fb73322f7785d8eaedc90a1b5d8765d Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 10 十二月 2024 22:44:03 +0800 Subject: [PATCH] 2024年12月10日22:43:59 --- app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 82 +++++++++-------------------------------- 1 files changed, 18 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java index 4f401fd..ddf7acf 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java @@ -3,6 +3,7 @@ import android.Manifest; import android.content.DialogInterface; +import android.content.Intent; import android.os.Bundle; import android.view.View; @@ -13,6 +14,7 @@ import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.base.CustomBaseActivity; +import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.ActivityPowerStationsListBinding; import com.hdl.photovoltaic.enums.ShowErrorMode; @@ -46,7 +48,6 @@ private HouseListAdapter houseListAdapter; private List<HouseIdBean> houseListBeanIDList; - private boolean is_edit = false;//琛ㄧず鏄惁鍦ㄧ紪杈戠姸鎬�(true=鍦ㄧ紪杈戠姸鎬�) @Override public Object getContentView() { @@ -70,7 +71,7 @@ private void initData() { this.houseListBeanIDList = new ArrayList<>(); this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList()); - setAllItemEdit(false); + setSelectState(); } private void initEvent() { @@ -78,33 +79,16 @@ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!is_edit) { - finish(); - return; - } - - is_edit = false; - viewBinding.addPowerStationRl.setVisibility(View.VISIBLE);//娣诲姞鐢电珯缁勪欢 - viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE); - initData();//鍒濆鍖栫紦瀛樻暟鎹� - setAllItemEdit(false); - houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 + finish(); } }); //缂栬緫鎸夐挳 viewBinding.toolbarTopRl.topMoreBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (is_edit) { - return; - } - - is_edit = true; - viewBinding.addPowerStationRl.setVisibility(View.GONE);//娣诲姞鐢电珯缁勪欢 - viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.GONE); - initData();//鍒濆鍖栫紦瀛樻暟鎹� - setAllItemEdit(true); - houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 + Intent intent = new Intent(); + intent.setClass(_mActivity, PowerStationsMoveActivity.class); + startActivity(intent); } }); @@ -118,37 +102,6 @@ } }); if (houseListAdapter != null) { - //鐢电珯绉诲姩浣嶇疆鎸夐挳 - 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 > 1) { - frontHomeId = houseListBeanIDList.get(position - 2).getHomeId(); - } - HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() { - @Override - public void onSuccess(Boolean obj) { - //绉诲姩鐢电珯浣嶇疆 - HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId()); - initData();//鍒濆鍖栫紦瀛樻暟鎹� - setAllItemEdit(is_edit); - houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 - nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌� - } - - @Override - public void onFailure(HDLException e) { - HdlThreadLogic.toast(_mActivity, e); - } - }); - - } - }); houseListAdapter.setOnItemClickListener(new HouseListAdapter.OnItemClickListener() { @Override public void onItemClick(int position, HouseIdBean houseBean) { @@ -165,8 +118,6 @@ houseSelectionDialog(houseBean); } }); - - } viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() { @@ -229,7 +180,7 @@ HdlResidenceLogic.getInstance().setHouseIdList(list); if (houseListAdapter != null) { initData(); - setAllItemEdit(is_edit); + setSelectState(); //鏇存柊UI houseListAdapter.setList(houseListBeanIDList); } @@ -258,16 +209,12 @@ } /** - * 璁剧疆鍏ㄩ儴缂撳瓨鏁版嵁缂栬緫鐘舵�� - * - * @param edit true琛ㄧず鍦ㄧ紪杈戠姸鎬� + * 璁剧疆褰撳墠鐢电珯閫変腑鐘舵�� */ - private void setAllItemEdit(boolean edit) { + private void setSelectState() { for (int i = 0; i < houseListBeanIDList.size(); i++) { - houseListBeanIDList.get(i).setMove(edit); - houseListBeanIDList.get(i).setDelIcon(false); if (UserConfigManage.getInstance().getHomeId().equals(houseListBeanIDList.get(i).getHomeId())) { - this.houseListBeanIDList.get(i).setState_select(!edit); + this.houseListBeanIDList.get(i).setState_select(true); } } } @@ -372,6 +319,13 @@ }); } + } else if (ConstantManage.REFRESH_HOME_LIST.equals(eventBus.getTopic())) { + if (houseListAdapter != null) { + initData(); + setSelectState(); + //鏇存柊UI + houseListAdapter.setList(houseListBeanIDList); + } } } -- Gitblit v1.8.0