From 4e65f5254a4e74dbbe691e5edba2775d6d66c0b0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 30 四月 2024 14:41:39 +0800
Subject: [PATCH] 2024年04月30日14:41:34
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 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 4907c52..ae48a10 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;
@@ -29,9 +28,7 @@
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;
@@ -73,9 +70,33 @@
private void initEvent() {
+ //鐢电珯鏍囩
+ viewBinding.powerStationLabel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style);
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style);
+ viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
+ viewBinding.deviceLabelParent.setVisibility(View.GONE);//璁惧鏍囩闅愯棌
+ }
+ });
+ //璁惧鏍囩
+ viewBinding.deviceLabel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text20Style);
+ viewBinding.powerStationLabel.setTextAppearance(R.style.Text16Style);
+ viewBinding.editIv.setVisibility(View.GONE);//缂栬緫鍥炬爣闅愯棌
+ viewBinding.addIv.setVisibility(View.GONE);//娣诲姞鍥炬爣闅愯棌
+ viewBinding.powerStationLabelParent.setVisibility(View.GONE);//鐢电珯鏍囩闅愯棌
+ viewBinding.deviceLabelParent.setVisibility(View.VISIBLE);
+
+
+ }
+ });
//娣诲姞鐢电珯
- viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
+ viewBinding.addIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
@@ -148,13 +169,15 @@
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(houseIdBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> list) {
- deleteResidence(houseIdBean.getHomeId());
- initializeInverter(list);
+ //鍙戣捣鍒犻櫎鐢电珯鎸囦护
+ deleteResidence(houseIdBean.getHomeId(), list);
+
}
@Override
public void onFailure(HDLException e) {
- deleteResidence(houseIdBean.getHomeId());
+ //鍙戣捣鍒犻櫎鐢电珯鎸囦护
+ deleteResidence(houseIdBean.getHomeId(), null);
}
});
@@ -184,22 +207,60 @@
}
});
-
//缂栬緫鐢电珯鎸夐挳
- viewBinding.toolbarTopFragmentHouseListRl.topEditIv.setOnClickListener(new View.OnClickListener() {
+ viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(HouseListEditActivity.class);
}
});
+ //鐢电珯鍚嶇О绛涢��
+ viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationNameRl.setSelected(!v.isSelected());
+ viewBinding.stationNameIv.setSelected(viewBinding.stationNameRl.isSelected());
+ }
+ });
+ //鐢电珯鍚嶇О绛涢��
+ viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationNameRl.setSelected(!v.isSelected());
+ viewBinding.stationNameIv.setSelected(viewBinding.stationNameRl.isSelected());
+ }
+ });
+ //鍙戠數鍔熺巼绛涢��
+ viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationPowerRl.setSelected(!v.isSelected());
+ viewBinding.stationPowerIv.setSelected(viewBinding.stationPowerRl.isSelected());
+ }
+ });
+ //褰撴棩鍙戠數閲忕瓫閫�
+ viewBinding.stationDayRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationDayRl.setSelected(!v.isSelected());
+ viewBinding.stationDayIv.setSelected(viewBinding.stationDayRl.isSelected());
+ }
+ });
+ //褰撴湀鍙戠數閲忕瓫閫�
+ viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.stationMonthRl.setSelected(!v.isSelected());
+ viewBinding.stationMonthIv.setSelected(viewBinding.stationMonthRl.isSelected());
+ }
+ });
+
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station);
- viewBinding.toolbarTopFragmentHouseListRl.topEditIv.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topEditIv.setImageResource(R.drawable.editor_house);
- viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add);
+ viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
+ viewBinding.deviceLabelParent.setVisibility(View.GONE);
+
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
@@ -424,15 +485,17 @@
* 鍒犻櫎鐢电珯
*
* @param homeId 鐢电珯id
+ * @param list 閫嗗彉鍣ㄥ垪琛�
*/
- private void deleteResidence(String homeId) {
+ private void deleteResidence(String homeId, List<GatewayBean> list) {
//鍒犻櫎浣忓畢
HdlResidenceLogic.getInstance().delResidence(homeId, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
hideLoading();
-
+ //鍙戣捣鍒濆鍖栨寚浠ょ粰閫嗗彉鍣�;
+ initializeInverter(list);
HdlResidenceLogic.getInstance().delHouseId(homeId);
initData();//鍒濆鍖栫紦瀛樻暟鎹�
houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
--
Gitblit v1.8.0