From afb62b49b79a31ab62a548f9cef672dfc9bae16f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:04:38 +0800
Subject: [PATCH] 2025年04月09日09:04:34
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 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 4b4d273..9dcfb51 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -5,7 +5,6 @@
import android.os.Process;
import android.os.SystemClock;
import android.text.TextUtils;
-import android.util.Log;
import com.google.gson.Gson;
@@ -20,11 +19,11 @@
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityCpowerStationBinding;
-import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.NetworkType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
+import com.hdl.photovoltaic.other.HdlESLocalJsonLogic;
+import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlOtaLogic;
@@ -46,14 +45,10 @@
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
-import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import cn.jpush.android.api.JPushInterface;
@@ -76,9 +71,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-// setNotificationBarBackgroundColor(CustomColor.white);
- getWindow().setStatusBarColor(getColor(R.color.text_FFFFFFFF));
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
@@ -87,6 +81,8 @@
this.initMqttClient();
//涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
this.pushTokens();
+ //鑾峰彇浜戠鑴氭湰
+ HdlESLocalJsonLogic.getInstance().getAllHdlESLocalJson();
}
@Override
@@ -105,12 +101,13 @@
runOnUiThread(new Runnable() {
@Override
public void run() {
- //浣庝簬瀹夊崜14鐗堟湰
- if (android.os.Build.VERSION.SDK_INT < 34) {
- startAppAutomaticallyOpenUni(false);
- } else {
- startAppAutomaticallyOpenUni(true);
- }
+ startAppAutomaticallyOpenUni(false);
+// //浣庝簬瀹夊崜14鐗堟湰
+// if (android.os.Build.VERSION.SDK_INT < 34) {
+// startAppAutomaticallyOpenUni(false);
+// } else {
+// startAppAutomaticallyOpenUni(false);
+// }
}
});
}
@@ -229,15 +226,17 @@
*/
private void startAppAutomaticallyOpenUni(boolean delay) {
- if (delay) {
- SystemClock.sleep(2000);
- }
+// if (delay) {
+// SystemClock.sleep(2000);
+// }
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);
@@ -453,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