From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
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 34f0e01..9dcfb51 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -72,6 +72,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
@@ -230,10 +231,12 @@
// }
if (TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
//鍏跺疄鍒锋柊token澶辫触宸查�氱煡閫�鍑虹櫥褰曪紝鏁版嵁宸茬粡娓呯┖锛屽洜涓虹瓑2s uni鍔犺浇鎱㈠鑷磋姹傞摼鎺ョ殑鏃跺�欏嚭鐜皌oken涓虹┖
+ HdlLogLogic.print("杩斿洖鍘�");
return;
}
+ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(0);
List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
- if (HouseIdList.size() == 0) {
+ if (HouseIdList.isEmpty()) {
if (TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) {
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
HdlUniLogic.getInstance().openUniMP(path, null);
@@ -449,7 +452,18 @@
}
+ } else if (linkResponse.getTopic().endsWith("/app/thing/property/send")) {
+ //璁惧鐘舵�佸彉鏇磘opic锛�/user/${homeId}/app/thing/property/send
+ if (linkResponse.getData() == null) {
+ HdlLogLogic.print("璁惧鐘舵�佸彉鏇�--->鏁版嵁涓虹┖", false);
+ return;
+ }
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(linkResponse.getTopic());
+ uniCallBackBaseBean.setData(linkResponse.getData());
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
}
+
}
}
};
--
Gitblit v1.8.0