From 8b43d4e1190fc9e2261be0579e53cc6c2987f946 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 27 十一月 2025 19:37:56 +0800
Subject: [PATCH] 2025年11月27日19:37:50 备份代码
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 106 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 31 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..770714d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -8,6 +8,7 @@
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
+import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -20,17 +21,22 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.Languages;
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.BadgeUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.umeng.commonsdk.UMConfigure;
import java.util.List;
+import java.util.Objects;
import cn.jpush.android.api.JPushInterface;
@@ -47,11 +53,14 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ Log.d("StartActivity", "onBindView");
setStatusBarTranslucent();
getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
+ BadgeUtils.cancelAllNotifications(_mActivity);
+ BadgeUtils.clearBadge(_mActivity);
//鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰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,45 +91,55 @@
});
} 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);
+ intent.putExtra("pushData", getIntentExpantData());
+ 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);
+ intent.putExtra("pushData", getIntentExpantData());
+ 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() + "&autoVerify=true";
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
}
+
}
+
@Override
public void startActivity(Intent intent) {
@@ -137,6 +156,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ Log.d("StartActivity", "onDestroy");
overridePendingTransition(0, 0);
}
@@ -164,7 +184,7 @@
int startIndex2 = s.lastIndexOf("銆�");
int endIndex2 = s.lastIndexOf("銆�") + 1;
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.en)) {
s = s.replace("銆�", "").replace("銆�", "");
endIndex1 -= 1;
startIndex2 -= 2;//绉婚櫎"銆�"鍜�"銆�"鎬婚暱搴﹀彂鐢熷彉鍖栵紝绱㈠紩涔熸敼鍙�;
@@ -245,6 +265,7 @@
//鍒濆鍖栨瀬鍏夋帹閫�
initJPush();
+
}
/**
@@ -254,6 +275,7 @@
JPushInterface.setDebugMode(true);
JPushInterface.init(getBaseContext());
}
+
/**
* 鍒濆鍖栧弸鐩烻DK锛屾姄闂��鏃ュ織
* 闆嗘垚鏁欑▼鍦板潃锛歨ttps://developer.umeng.com/docs/119267/detail/118588
@@ -267,4 +289,26 @@
UMConfigure.setLogEnabled(false);//AppConfigManage.isDebug()
}
+ /**
+ * 澶勭悊浠庨�氱煡鐐瑰嚮甯︽潵鐨勬暟鎹紝杩欓噷鑾峰彇鏁版嵁锛岀劧鍚庨�忎紶缁欎富鐣岄潰鍋氬鐞�
+ *
+ * @return 杩斿洖闄勫姞鏁版嵁
+ */
+ private String getIntentExpantData() {
+ try {
+ // 澶勭悊浠庨�氱煡鐐瑰嚮甯︽潵鐨勬暟鎹紝杩欓噷鑾峰彇鏁版嵁锛岀劧鍚庨�忎紶缁欎富鐣岄潰鍋氬鐞�
+ if (getIntent().getExtras() != null) {
+ for (String key : getIntent().getExtras().keySet()) {
+ if (key.equals("pushData")) {
+ return Objects.requireNonNull(getIntent().getExtras().get(key)).toString();
+ }
+ }
+ }
+ } catch (Exception e) {
+ return "";
+ }
+ return "";
+ }
+
+
}
--
Gitblit v1.8.0