From 0770fc4f03196a27e8f4c899a44da63bb1a683e2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 12 六月 2025 18:17:29 +0800
Subject: [PATCH] 2025年06月12日18:17:27
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index b6ef66e..f952fc9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -22,8 +22,10 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.me.WebActivity;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
@@ -51,7 +53,7 @@
getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰APP绗竴娆″惎鍔ㄦ彁鍓嶆彁绀恒�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�嬫墠鍏佽涓婄嚎
final String key = "is_login";
- HDLUniMPSDKManager.isExistsActivity=false;
+ HDLUniMPSDKManager.isExistsActivity = false;
boolean isLogin = SharedPreUtils.getBoolean(key);
if (!isLogin) {
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
@@ -82,41 +84,47 @@
});
} else {
initSdk();
- //鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
- AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
- //鍒ゆ柇AccessToken鏄惁null
- if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- openActivity(intent);
- } else {
- //C绔敤鎴疯烦杞晫闈�
+ if (!UserConfigManage.getInstance().isNoNetworkFlag()) {
+ //鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
+ AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
+ //鍒ゆ柇AccessToken鏄惁null
+ if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ openActivity(intent);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
// showLoading();
- HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
- @Override
- public void onSuccess(List<HouseIdBean> obj) {
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ @Override
+ public void onSuccess(List<HouseIdBean> obj) {
// hideLoading();
- HdlResidenceLogic.getInstance().setHouseIdList(obj);
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, CPowerStationActivity.class);
- openActivity(intent);
- }
+ HdlResidenceLogic.getInstance().setHouseIdList(obj);
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, CPowerStationActivity.class);
+ openActivity(intent);
+ }
- @Override
- public void onFailure(HDLException e) {
+ @Override
+ public void onFailure(HDLException e) {
// hideLoading();
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, CPowerStationActivity.class);
- openActivity(intent);
- }
- });
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, CPowerStationActivity.class);
+ openActivity(intent);
+ }
+ });
+ }
+ } else {
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, LoginActivity.class);
+ openActivity(intent);
}
} else {
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, LoginActivity.class);
- openActivity(intent);
+ //鏃犵綉妯″紡-璺冲埌灏忕▼搴忚澶囧垪琛ㄧ晫闈�
+ String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword();
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
}
@@ -254,6 +262,7 @@
JPushInterface.setDebugMode(true);
JPushInterface.init(getBaseContext());
}
+
/**
* 鍒濆鍖栧弸鐩烻DK锛屾姄闂��鏃ュ織
* 闆嗘垚鏁欑▼鍦板潃锛歨ttps://developer.umeng.com/docs/119267/detail/118588
--
Gitblit v1.8.0