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/uni/HDLUniMP.java | 5
app/src/main/res/values/strings.xml | 4
app/src/main/AndroidManifest.xml | 3
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 20
app/src/main/res/drawable/del_home.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 9
app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java | 93 +++++++
app/src/main/res/layout/item_house_line_c.xml | 44 ++
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 3
/dev/null | 0
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 33 ++
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 18 +
app/src/main/res/drawable/select.png | 0
app/src/main/res/layout/swipe_right_layout.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java | 246 ++++++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 117 ++++++++-
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 20 -
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 53 ----
app/src/main/res/layout/activity_house_list_edit.xml | 44 +++
19 files changed, 584 insertions(+), 130 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5591c6..40a7af7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,6 +77,9 @@
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
<activity
+ android:name=".ui.powerstation.HouseListEditActivity"
+ android:exported="false" />
+ <activity
android:name=".ui.newC.MessageCenterList"
android:exported="false" />
<activity
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index 6f8b238..efabddf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -52,8 +52,6 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-
-
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
@@ -71,17 +69,17 @@
List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
if (HouseIdList.size() == 0) {
-// String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
-// HdlUniLogic.getInstance().openUniMP(path, null);
-
-
- String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C
- + "?homeId=" + ""
- + "&homeName=" + ""
- + "&powerStationStatus=" + 1;
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
HdlUniLogic.getInstance().openUniMP(path, null);
} else {
- HouseIdBean houseIdBean = HouseIdList.get(0);
+ int select_home = 0;
+ for (int i = 0; i < HouseIdList.size(); i++) {
+ if (HouseIdList.get(i).getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ select_home = i;
+ break;
+ }
+ }
+ HouseIdBean houseIdBean = HouseIdList.get(select_home);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C
+ "?homeId=" + houseIdBean.getHomeId()
+ "&homeName=" + houseIdBean.getHomeName()
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index bc75fb5..2c00737 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -74,26 +74,8 @@
holder.item_parent_rl.setTag(position);
setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(4));
- if (houseIdBean.isEdit()) {
- holder.item_parent_swipeLayout.postDelayed(new Runnable() {
- @Override
- public void run() {
- holder.item_parent_swipeLayout.open();
-// holder.item_parent_swipeLayout.open(false, false);
- }
- }, 50);
- } else {
- holder.item_parent_swipeLayout.postDelayed(new Runnable() {
- @Override
- public void run() {
- holder.item_parent_swipeLayout.close();
-// holder.item_parent_swipeLayout.close(false, false);
- }
- }, 50);
- }
-
- HdlLogLogic.print("鐢电珯鍚嶇О--->" + houseIdBean.getHomeName() + "--->" + houseIdBean.isEdit() + "--->" + holder.item_parent_swipeLayout.toString());
+ HdlLogLogic.print("鐢电珯鍚嶇О--->" + houseIdBean.getHomeName() + "--->" + houseIdBean.isMove() + "--->" + holder.item_parent_swipeLayout.toString());
holder.item_parent_rl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index e9103d3..4f54f95 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -18,14 +18,37 @@
private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
private String localSecret;//鏈湴閫氳绉橀挜
- private boolean isEdit = false;//鏄惁绉婚櫎鐢电珯浣嶇疆(true琛ㄧず绉婚櫎)
+ private boolean isMove = false;//琛ㄧず鏄惁鏄剧ず绉诲姩缁勪欢(true鏄剧ず)
- public boolean isEdit() {
- return isEdit;
+ private boolean isDelIcon = false;//琛ㄧず鏄惁鏄剧ず鍒犻櫎缁勪欢(true鏄剧ず)
+
+
+ private boolean state_select = false;//琛ㄧず鏄惁鏄剧ず閫変腑缁勪欢(true鏄剧ず)
+
+
+ public boolean isState_select() {
+ return state_select;
}
- public void setEdit(boolean edit) {
- isEdit = edit;
+ public void setState_select(boolean state_select) {
+ this.state_select = state_select;
+ }
+
+ public boolean isDelIcon() {
+ return isDelIcon;
+ }
+
+ public void setDelIcon(boolean delIcon) {
+ isDelIcon = delIcon;
+ }
+
+
+ public boolean isMove() {
+ return isMove;
+ }
+
+ public void setMove(boolean edit) {
+ isMove = edit;
}
public String getHomeId() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
index 4a99cb1..bb7c02f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
@@ -27,6 +27,8 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
@@ -286,10 +288,18 @@
* 杩斿洖缁欎笂涓�绾х晫闈㈡暟鎹�
*/
private void backPressedData() {
- Intent intent = new Intent();
- intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
- intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
- setResult(10, intent);
+
+ if (UserConfigManage.getInstance().isBAccount()) {
+ Intent intent = new Intent();
+ intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
+ intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
+ setResult(10, intent);
+ } else {
+ //閫氱煡缁欏皬绋嬪簭鏇存柊鍥惧儚鎴栬�呯敤鎴峰悕
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index 5002a1e..7c2523b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -13,6 +13,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -26,9 +27,11 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.message.MessageInfoActivity;
import com.hdl.photovoltaic.ui.newC.adapter.MessageCenterListAdapter;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.widget.TypeTitleListDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -96,6 +99,12 @@
@Override
public void onClick(View v) {
clearCacheData();
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO);
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ uniCallBackBaseBean.setData(jsonObject);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER, uniCallBackBaseBean);
finish();
}
});
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 3b48abb..e9ebde6 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
@@ -1,23 +1,35 @@
package com.hdl.photovoltaic.ui.newC;
+import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityPowerStationsListBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.ui.CPowerStationActivity;
+import com.hdl.photovoltaic.ui.StartActivity;
+import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
+import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import java.util.ArrayList;
import java.util.List;
@@ -55,6 +67,7 @@
private void initData() {
this.houseListBeanIDList = new ArrayList<>();
this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
+ setAllItemEdit(false);
}
private void initEvent() {
@@ -99,26 +112,48 @@
});
if (houseListAdapter != null) {
//鐢电珯绉诲姩浣嶇疆鎸夐挳
- houseListAdapter.setNoOnclickListener(new HouseListAdapter.OnClickListener() {
+ houseListAdapter.setMoveOnclickListener(new HouseListAdapter.OnMoveClickListener() {
@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();//鍒濆鍖栫紦瀛樻暟鎹�
- houseListAdapter.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();//鍒濆鍖栫紦瀛樻暟鎹�
+ 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) {
+ for (int i = 0; i < houseListBeanIDList.size(); i++) {
+ HouseIdBean houseIdBean = houseListBeanIDList.get(i);
+ houseIdBean.setState_select(false);
+ }
+ houseListBeanIDList.get(position).setState_select(true);
+ houseListAdapter.notifyDataSetChanged();
+ if (UserConfigManage.getInstance().getHomeId().equals(houseBean.getHomeId())) {
+ //鍚屼竴涓笉鎵ц寮圭獥
+ return;
+ }
+ houseSelectionDialog(houseBean);
+ }
+ });
+
}
}
@@ -195,7 +230,11 @@
*/
private void setAllItemEdit(boolean edit) {
for (int i = 0; i < houseListBeanIDList.size(); i++) {
- houseListBeanIDList.get(i).setEdit(edit);
+ 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);
+ }
}
}
@@ -205,4 +244,48 @@
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);
}
+
+ /**
+ * 浜屾纭鎻愮ず妗�
+ *
+ * @param houseIdBean 閫変腑鏁版嵁
+ */
+ private void houseSelectionDialog(HouseIdBean houseIdBean) {
+ ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this);
+ dialog.setTitle(getString(R.string.loading_title_tip));
+ dialog.setContent(getString(R.string.switch_power_station).replace("%s", "\"" + houseIdBean.getHomeName() + "\""));
+ dialog.show();
+ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ UserConfigManage.getInstance().setHomeId(houseIdBean.getHomeId());
+ UserConfigManage.getInstance().Save();
+ dialog.dismiss();
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("homeId", houseIdBean.getHomeId());
+ jsonObject.addProperty("homeName", houseIdBean.getHomeName());
+ jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus());
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
+ uniCallBackBaseBean.setData(jsonObject);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ finish();
+
+// //todo 閫昏緫: 杩欓噷鍙互鎸囧畾鍏抽棴灏忕▼搴忚鎯咃紝鐒跺悗鍐嶉噸鏂版墦寮�璇︽儏鐣岄潰;
+// String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C
+// + "?homeId=" + houseIdBean.getHomeId()
+// + "&homeName=" + houseIdBean.getHomeName()
+// + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
+// HdlUniLogic.getInstance().openUniMP(path, null);
+
+ }
+ });
+ dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ houseListAdapter.notifyDataSetChanged();
+ dialog.dismiss();
+ }
+ });
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
index 306b948..f6903c7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
@@ -8,9 +8,11 @@
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
import androidx.recyclerview.widget.RecyclerView;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import java.util.ArrayList;
@@ -24,7 +26,10 @@
private Context mContext;
private List<HouseIdBean> mList;
- public OnClickListener mOnClickListener;
+ public OnMoveClickListener mOnMoveClickListener;
+ public OnDelClickListener mOnDelClickListener;
+ public OnItemClickListener mOnItemClickListener;
+
public HouseListAdapter(Context context) {
this.mContext = context;
@@ -43,18 +48,68 @@
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
holder.itemView.setTag(position);
- if (houseIdBean.isEdit()) {
+ if (houseIdBean.isDelIcon()) {
+ holder.houseDelIv.setVisibility(View.VISIBLE);
+ } else {
+ holder.houseDelIv.setVisibility(View.GONE);
+ }
+
+ if (houseIdBean.isMove()) {
holder.homeMoveIv.setVisibility(View.VISIBLE);
} else {
holder.homeMoveIv.setVisibility(View.GONE);
}
+
+ if (!houseIdBean.isMove()) {
+ holder.houseSelectIv.setVisibility(View.VISIBLE);
+ holder.houseSelectIv.setBackground(null);
+ holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_90000000));
+ if (houseIdBean.isState_select()) {
+ holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_38C494));
+ holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
+ }
+ } else {
+ holder.houseSelectIv.setVisibility(View.GONE);
+ }
+
+ //鍒犻櫎鐢电珯浣嶇疆
+ holder.houseDelIv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ try {
+ if (mOnDelClickListener != null) {
+ mOnDelClickListener.onDelClick((int) holder.itemView.getTag(), houseIdBean);
+ }
+ } catch (Exception ignored) {
+ }
+ }
+ });
+
+
//绉诲姩鐢电珯浣嶇疆
holder.homeMoveIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
- if (mOnClickListener != null) {
- mOnClickListener.onMoveClick((int) holder.itemView.getTag(), houseIdBean);
+ if (mOnMoveClickListener != null) {
+ mOnMoveClickListener.onMoveClick((int) holder.itemView.getTag(), houseIdBean);
+ }
+ } catch (Exception ignored) {
+ }
+ }
+ });
+
+ holder.itemView.setTag(position);//鏍囪浣嶇疆
+ holder.itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ try {
+ if (holder.houseSelectIv.getVisibility() == View.GONE) {
+ //閫変腑鍥炬爣缁勪欢闅愯棌鐨勬椂鍊欑偣鍑绘棤鏁�
+ return;
+ }
+ if (mOnItemClickListener != null) {
+ mOnItemClickListener.onItemClick((int) holder.itemView.getTag(), houseIdBean);
}
} catch (Exception ignored) {
}
@@ -81,26 +136,48 @@
}
- public void setNoOnclickListener(OnClickListener onClickListener) {
- this.mOnClickListener = onClickListener;
+ public void setMoveOnclickListener(OnMoveClickListener onMoveClickListener) {
+ this.mOnMoveClickListener = onMoveClickListener;
+ }
+
+ public void setDelOnclickListener(OnDelClickListener onDelClickListener) {
+ this.mOnDelClickListener = onDelClickListener;
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.mOnItemClickListener = onItemClickListener;
}
static class MyViewHolder extends RecyclerView.ViewHolder {
public TextView homeNameTv;//浣忓畢鍚嶇О
- public ImageView homeMoveIv;//浣忓畢鍥剧墖
+ public ImageView houseDelIv;//鍒犻櫎鍥炬爣
+ public ImageView homeMoveIv;//浣嶇疆绉诲姩鍥炬爣
+ public ImageView houseSelectIv;//浣嶇疆绉诲姩鍥炬爣
public MyViewHolder(@NonNull View itemView) {
super(itemView);
homeNameTv = itemView.findViewById(R.id.house_name_tv);
+ houseDelIv = itemView.findViewById(R.id.house_del_iv);
homeMoveIv = itemView.findViewById(R.id.house_move_iv);
+ houseSelectIv = itemView.findViewById(R.id.house_select_iv);
}
}
- public interface OnClickListener {
+ public interface OnMoveClickListener {
void onMoveClick(int position, HouseIdBean houseIdBean);
}
+ public interface OnDelClickListener {
+ void onDelClick(int position, HouseIdBean houseIdBean);
+
+ }
+
+ public interface OnItemClickListener {
+ void onItemClick(int position, HouseIdBean houseIdBean);
+
+ }
+
}
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
new file mode 100644
index 0000000..80f6d0c
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java
@@ -0,0 +1,246 @@
+package com.hdl.photovoltaic.ui.powerstation;
+
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+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.ActivityHouseListEditBinding;
+import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.ShowErrorMode;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.other.HdlResidenceLogic;
+import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
+import com.hdl.photovoltaic.widget.DelayedConfirmationCancelDialog;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 鐢电珯缂栬緫锛圔绔級
+ */
+public class HouseListEditActivity extends CustomBaseActivity {
+
+ private ActivityHouseListEditBinding viewBinding;
+
+ private HouseListAdapter houseListAdapter;
+ private List<HouseIdBean> houseListBeanIDList;
+
+
+ @Override
+ public Object getContentView() {
+ viewBinding = ActivityHouseListEditBinding.inflate(getLayoutInflater());
+ return viewBinding.getRoot();
+ }
+
+ @Override
+ public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
+ //鍒濆鍖栨暟鎹�
+ initData();
+ //鍒濆鍖�
+ initView();
+ //鍒濆鍖栫晫闈㈢洃鍚櫒
+ initEvent();
+ }
+
+ private void initData() {
+ this.houseListBeanIDList = new ArrayList<>();
+ 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);
+
+ }
+ }
+
+ private void initEvent() {
+ //杩斿洖鎸夐挳
+ viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.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();
+ }
+ });
+
+ //璁剧疆涓嬫媺绠ご棰滆壊
+ viewBinding.fragmentHouseSrl.setColorSchemeResources(R.color.text_FF245EC3);
+ //鍒楄〃涓嬫媺鎸夐挳
+ viewBinding.fragmentHouseSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+ @Override
+ public void onRefresh() {
+ downReadData(true);
+ }
+ });
+ if (houseListAdapter != null) {
+ //鐢电珯绉诲姩浣嶇疆鎸夐挳
+ houseListAdapter.setMoveOnclickListener(new HouseListAdapter.OnMoveClickListener() {
+ @Override
+ public void onMoveClick(int position, HouseIdBean houseIdBean) {
+
+ 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();//鍒濆鍖栫紦瀛樻暟鎹�
+ houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
+ nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌�
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HdlThreadLogic.toast(_mActivity, e);
+ }
+ });
+ }
+ });
+
+ //鐢电珯绉诲姩浣嶇疆鎸夐挳
+ houseListAdapter.setDelOnclickListener(new HouseListAdapter.OnDelClickListener() {
+ @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() + "\"";
+ delayedConfirmationCancelDialog.setContent(getString(R.string.delete_power_station).replace("%s", 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();//鍒濆鍖栫紦瀛樻暟鎹�
+ houseListAdapter.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();
+ }
+ });
+
+ }
+ });
+ }
+
+ }
+
+ 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);
+ LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
+ houseListAdapter = new HouseListAdapter(_mActivity);
+ viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
+ viewBinding.fragmentHouseSrlListRc.setAdapter(houseListAdapter);
+ houseListAdapter.setList(this.houseListBeanIDList);
+ this.nullDataUpdateUi(houseListBeanIDList);
+ }
+
+ /**
+ * 鍒锋柊UI
+ *
+ * @param isRefreshing 琛ㄧず鏄笅鎷夊埛鏂扮殑
+ */
+ private void downReadData(boolean isRefreshing) {
+ //鑾峰彇浣忓畢(鐢电珯)ID鍒楄〃
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ @Override
+ public void onSuccess(List<HouseIdBean> list) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isRefreshing) {
+ //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
+ viewBinding.fragmentHouseSrl.setRefreshing(false);
+ }
+ if (list != null && list.size() > 0) {
+ //鏇存柊缂撳瓨
+ HdlResidenceLogic.getInstance().setHouseIdList(list);
+ if (houseListAdapter != null) {
+ initData();
+ setAllItemEdit(true);
+ //鏇存柊UI
+ houseListAdapter.setList(houseListBeanIDList);
+ }
+
+ }
+ nullDataUpdateUi(list);
+ }
+ }, _mActivity, ShowErrorMode.YES);
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ if (isRefreshing) {
+ //鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
+ viewBinding.fragmentHouseSrl.setRefreshing(false);
+ }
+
+ }
+ }, _mActivity, ShowErrorMode.YES);
+ }
+ });
+ }
+
+ /**
+ * 璁剧疆鍏ㄩ儴缂撳瓨鏁版嵁缂栬緫鐘舵��
+ *
+ * @param edit true琛ㄧず鍦ㄧ紪杈戠姸鎬�
+ */
+ private void setAllItemEdit(boolean edit) {
+ for (int i = 0; i < houseListBeanIDList.size(); i++) {
+ houseListBeanIDList.get(i).setMove(edit);
+ }
+ }
+
+ /**
+ * 娌℃湁鐢电珯鍒楄〃鐨勬牱寮�
+ */
+ 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);
+ }
+}
\ No newline at end of file
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 46300d6..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
@@ -40,7 +40,6 @@
* (浣忓畢)鐢电珯鍒楄〃-鐣岄潰
*/
public class HouseListFragment extends CustomBaseFragment {
- private boolean is_edit = false;
private FragmentHouseListBinding viewBinding;
private HouseInfoAdapter houseInfoAdapter;
private CameraManager manager;
@@ -66,23 +65,11 @@
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);
}
@@ -99,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);
@@ -135,8 +121,6 @@
@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() + "\"";
@@ -152,7 +136,6 @@
public void onSuccess(Boolean obj) {
HdlResidenceLogic.getInstance().delHouseId(houseIdBean.getHomeId());
initData();//鍒濆鍖栫紦瀛樻暟鎹�
- setAllItemEdit(is_edit);
houseInfoAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃
nullDataUpdateUi(houseListBeanIDList);//妫�娴嬫暟鎹槸鍚︿负绌�
delayedConfirmationCancelDialog.dismiss();
@@ -179,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);
}
});
}
@@ -282,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
@@ -324,7 +283,6 @@
HdlResidenceLogic.getInstance().setHouseIdList(list);
if (houseInfoAdapter != null) {
initData();
- setAllItemEdit(is_edit);
//鏇存柊UI
houseInfoAdapter.setList(houseListBeanIDList);
}
@@ -352,13 +310,6 @@
});
}
- /**
- * 鎭㈠鍒版湭缂栬緫鐢电珯鐘舵��
- */
- private void resumeTagStatus() {
- is_edit = false; //杩樺師缂栬緫鏍囪
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.GONE);//闅愯棌鍚庨��鍥炬爣
- }
/**
* 鐢宠鏉冮檺
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 4f259b0..eb22cfd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -86,8 +86,9 @@
//region --------銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆�--------
public final static String UNI_EVENT_NOTIFICATION_DEVICE_MODEL = "uni_notification_model";//閫氱煡妯″潡(澶х被)
- public final static String UNI_EVENT_NOTIFICATION_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛�
- public final static String UNI_EVENT_NOTIFICATION_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛�
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS = "refresh_details";//鍒锋柊鐢电珯璇︽儏
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO = "refresh_userinfo";//鍒锋柊鐢ㄦ埛淇℃伅
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER= "refresh_unread_messages_number";//鍒锋柊鏈娑堟伅鏁伴噺
public final static String UNI_EVENT_NOTIFICATION_DEVICE_ADD = "add";//璁惧娣诲姞
public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//璁惧鍒犻櫎
public final static String UNI_EVENT_NOTIFICATION_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index 8f214c8..b120252 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -92,12 +92,13 @@
private void removeCallBack() {
DCUniMPSDK.getInstance().setUniMPOnCloseCallBack(null);
DCUniMPSDK.getInstance().setOnUniMPEventCallBack(null);
+
}
/**
* 鐩戝惉鐩稿叧鍥炶皟
*/
- private void registerCallBack() {
+ private void registerCallBack() {DCUniMPSDK.getInstance();
//1.璁剧疆灏忕▼搴忚鍏抽棴浜嬩欢鐩戝惉
DCUniMPSDK.getInstance().setUniMPOnCloseCallBack(new IUniMPOnCloseCallBack() {
@Override
diff --git a/app/src/main/res/drawable/del_home.png b/app/src/main/res/drawable/del_home.png
new file mode 100644
index 0000000..7194309
--- /dev/null
+++ b/app/src/main/res/drawable/del_home.png
Binary files differ
diff --git a/app/src/main/res/drawable/del_house.png b/app/src/main/res/drawable/del_house.png
deleted file mode 100644
index e6bd9be..0000000
--- a/app/src/main/res/drawable/del_house.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/select.png b/app/src/main/res/drawable/select.png
new file mode 100644
index 0000000..4725a82
--- /dev/null
+++ b/app/src/main/res/drawable/select.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_house_list_edit.xml b/app/src/main/res/layout/activity_house_list_edit.xml
new file mode 100644
index 0000000..d16924d
--- /dev/null
+++ b/app/src/main/res/layout/activity_house_list_edit.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/text_EDEFF2"
+ tools:context=".ui.powerstation.HouseListEditActivity">
+
+ <include
+ android:id="@+id/toolbar_top_fragment_house_list_rl"
+ layout="@layout/toolbar_top_view_44" />
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/fragment_house_srl"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginTop="@dimen/dp_10"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/fragment_house_srl_list_rc"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_16" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_house_line_c.xml b/app/src/main/res/layout/item_house_line_c.xml
index d65f728..5d50882 100644
--- a/app/src/main/res/layout/item_house_line_c.xml
+++ b/app/src/main/res/layout/item_house_line_c.xml
@@ -8,28 +8,53 @@
<TextView
android:id="@+id/house_name_tv"
- android:layout_width="300dp"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_19"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/power_station"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_16"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <ImageView
- android:id="@+id/house_move_iv"
- android:layout_width="@dimen/dp_40"
- android:layout_height="@dimen/dp_40"
- android:layout_marginEnd="@dimen/dp_21"
- android:src="@drawable/move_c_house"
- android:visibility="gone"
+ <LinearLayout
+ android:id="@+id/house_Image_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/house_del_iv"
+ android:layout_width="@dimen/dp_40"
+ android:layout_height="@dimen/dp_40"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:src="@drawable/del_home"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/house_move_iv"
+ android:layout_width="@dimen/dp_40"
+ android:layout_height="@dimen/dp_40"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:src="@drawable/move_c_house"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/house_select_iv"
+ android:layout_width="@dimen/dp_40"
+ android:layout_height="@dimen/dp_40"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:visibility="gone" />
+ </LinearLayout>
<View
android:layout_width="match_parent"
@@ -37,7 +62,6 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="0.5dp"
- android:background="@color/text_EDEFF2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/swipe_right_layout.xml b/app/src/main/res/layout/swipe_right_layout.xml
index 340d2ba..9e67d01 100644
--- a/app/src/main/res/layout/swipe_right_layout.xml
+++ b/app/src/main/res/layout/swipe_right_layout.xml
@@ -23,7 +23,7 @@
android:id="@+id/del_home_iv"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
- android:src="@drawable/del_house" />
+ android:src="@drawable/del_home" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b26906..99f8730 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -221,7 +221,7 @@
<string name="succeed">鎴愬姛.</string>
- <string name="delete_power_station">鏄惁瑕佸垹闄X鐢电珯?</string>
+ <string name="delete_power_station">鏄惁瑕佸垹闄�%s鐢电珯?</string>
<string name="power_station_selection">鐢电珯閫夋嫨</string>
<string name="alarm_all_device">鍏ㄩ儴璁惧</string>
<string name="alarm_all_device_inverter">閫嗗彉鍣�</string>
@@ -238,6 +238,8 @@
<string name="alarm_all_time_30">杩�30澶�</string>
<string name="alarm_device">璁惧鎶ヨ</string>
<string name="alarm_record">鎶ヨ璁板綍</string>
+ <string name="power_station_editing">鐢电珯缂栬緫</string>
+ <string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯?</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0