From c870de9e4207c7af37229cb24b9ca0e2d1e1215f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 09 十二月 2024 15:09:00 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 3207246..b036a95 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
@@ -57,8 +57,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
//鍒濆鍖栨暟鎹�
initData();
//鍒濆鍖�
@@ -195,9 +194,7 @@
}
private void initView() {
- viewBinding.toolbarTopRl.getRoot().setBackgroundColor(getColor(R.color.text_FFECECEC));
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_selection);
viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopRl.topMoreIv.setImageResource(R.drawable.editor_house);
@@ -296,7 +293,7 @@
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
- HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean,true);
dialog.dismiss();
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("homeId", houseIdBean.getHomeId());
--
Gitblit v1.8.0