From 0b6f27a6aeeb6eb3d5ee55b500797875c2bd5d2c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 12 三月 2024 21:08:03 +0800
Subject: [PATCH] 2024年03月12日21:07:52
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 97 +++++++++++-------------------------------------
1 files changed, 22 insertions(+), 75 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 e93297e..88b0304 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,7 +2,6 @@
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;
@@ -28,8 +27,6 @@
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;
@@ -43,7 +40,6 @@
* (浣忓畢)鐢电珯鍒楄〃-鐣岄潰
*/
public class HouseListFragment extends CustomBaseFragment {
- private boolean is_edit = false;
private FragmentHouseListBinding viewBinding;
private HouseInfoAdapter houseInfoAdapter;
private CameraManager manager;
@@ -69,29 +65,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) {
-// resumeTagStatus();
-// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
-
- Intent intent = new Intent();
- intent.setClass(_mActivity, MessageCenterList.class);
- startActivity(intent);
-
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
}
});
@@ -107,7 +86,6 @@
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);
@@ -118,29 +96,31 @@
@Override
public void onMoveClick(int position, HouseIdBean houseIdBean) {
-// 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);
-// }
-// });
+ String frontHomeId = "";
+ if (position > 0) {
+ frontHomeId = houseListBeanIDList.get(position - 1).getHomeId();
+ }
+ 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) {
-
-
DelayedConfirmationCancelDialog delayedConfirmationCancelDialog = new DelayedConfirmationCancelDialog(_mActivity);
delayedConfirmationCancelDialog.setTitleContent(getString(R.string.loading_title_tip));
String homeName = "\"" + houseIdBean.getHomeName() + "\"";
@@ -156,7 +136,6 @@
public void onSuccess(Boolean obj) {
HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());
initData();//鍒濆鍖栫紦瀛樻暟鎹�
- setAllItemEdit(is_edit);
houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌�
delayedConfirmationCancelDialog.dismiss();
@@ -183,18 +162,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);
}
});
}
@@ -286,25 +254,12 @@
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) {
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愮數绔欍��");
- resumeTagStatus();
initData();//鍒濆鍖栫紦瀛樻暟鎹�
- setAllItemEdit(false);
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
@@ -328,7 +283,6 @@
HdlResidenceLogic.getInstance().setHouseIdList(list);
if (houseInfoAdapter != null) {
initData();
- setAllItemEdit(is_edit);
//鏇存柊UI
houseInfoAdapter.setList(houseListBeanIDList);
}
@@ -356,13 +310,6 @@
});
}
- /**
- * 鎭㈠鍒版湭缂栬緫鐢电珯鐘舵��
- */
- private void resumeTagStatus() {
- is_edit = false; //杩樺師缂栬緫鏍囪
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.GONE);//闅愯棌鍚庨��鍥炬爣
- }
/**
* 鐢宠鏉冮檺
--
Gitblit v1.8.0