From a2eb306d865fedf8cf505020bf06ad4359169b8e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 20 一月 2025 21:53:44 +0800
Subject: [PATCH] 2025年01月20日21:53:42
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 149 +++++++++++++++++++++++++++++--------------------
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 11 ++-
2 files changed, 95 insertions(+), 65 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 4c8df7f..77351e4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -62,6 +62,12 @@
private Boolean isLogEnabled = true;
//涓夋柟sdk鍒濆鍖栨爣璇�
private Boolean isInitThirdSDK = false;
+ //涓夋柟sdk鍒濆鍖栨爣璇�
+ /**
+ * 涓夋柟sdk鍒濆鍖栨爣璇�
+ * 鍦⊿tartActivity閲岄潰鍒濆鍖栦笁鏂筍DK鐨勬爣璇�
+ */
+ public Boolean isStartInitThirdSDK = false;
//澹版槑涓�涓綋鍓嶅簲鐢ㄧ殑瀹炰緥
private static HDLApp mHDLApp;
//澹版槑涓�涓叕鍏辩殑淇℃伅鏄犲皠,鍙綋浣滃叏灞�鍙橀噺浣跨敤;
@@ -149,8 +155,8 @@
// //9.鍒濆鍖栫綉缁滃伐鍏�
// NetWorkUtil.init(this);
initAutoSize();
- //鍒濆鍖栨瀬鍏夋帹閫�
- initJPush();
+// //鍒濆鍖栨瀬鍏夋帹閫�
+// initJPush();
initHDLLinkPMSdk();
HDLLinkLocalSdk.getInstance().init(getInstance());
initSocket();
@@ -269,7 +275,6 @@
private void initJPush() {
JPushInterface.setDebugMode(true);
JPushInterface.init(getBaseContext());
-
}
/**
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 2407b1a..12654b4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -16,20 +16,26 @@
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
+import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
+import com.hdl.sdk.link.HDLLinkLocalSdk;
import java.util.List;
+
+import cn.jpush.android.api.JPushInterface;
+import io.dcloud.common.util.RuningAcitvityUtil;
/**
@@ -46,74 +52,73 @@
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
- //鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
- 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) {
-// hideLoading();
- HdlResidenceLogic.getInstance().setHouseIdList(obj);
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, CPowerStationActivity.class);
- openActivity(intent);
- }
-
- @Override
- public void onFailure(HDLException e) {
-// hideLoading();
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, CPowerStationActivity.class);
- openActivity(intent);
- }
- });
- }
+ //鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰APP绗竴娆″惎鍔ㄦ彁鍓嶆彁绀恒�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�嬫墠鍏佽涓婄嚎
+ final String key = "is_login";
+ boolean isLogin = SharedPreUtils.getBoolean(key);
+ if (!isLogin) {
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
+ confirmationCancelDialog.setTitle(getString(R.string.user_agreement_and_privacy_agreement));
+ confirmationCancelDialog.setContent(getString(R.string.thank_you_for_using));
+ confirmationCancelDialog.setConfirmation(getString(R.string.agree));
+ confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
+ confirmationCancelDialog.show();
+ setStringDifferentColors(confirmationCancelDialog.getContentTextView());
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ SharedPreUtils.putBoolean(key, false);
+ finish();
+ }
+ });
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ initSdk();
+ SharedPreUtils.putBoolean(key, true);
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, LoginActivity.class);
+ openActivity(intent);
+ }
+ });
} else {
- //鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰APP绗竴娆″惎鍔ㄦ彁鍓嶆彁绀恒�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�嬫墠鍏佽涓婄嚎
- final String key = "is_login";
- boolean isLogin = SharedPreUtils.getBoolean(key);
- if (isLogin) {
+ 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绔敤鎴疯烦杞晫闈�
+// showLoading();
+ 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);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+// hideLoading();
+ 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 {
- ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
- confirmationCancelDialog.setTitle(getString(R.string.user_agreement_and_privacy_agreement));
- confirmationCancelDialog.setContent(getString(R.string.thank_you_for_using));
- confirmationCancelDialog.setConfirmation(getString(R.string.agree));
- confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
- confirmationCancelDialog.show();
- setStringDifferentColors(confirmationCancelDialog.getContentTextView());
- confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
- @Override
- public void Cancel() {
- SharedPreUtils.putBoolean(key, false);
- finish();
- }
- });
- confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
- @Override
- public void Confirm() {
- SharedPreUtils.putBoolean(key, true);
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, LoginActivity.class);
- openActivity(intent);
- }
- });
}
-
-
}
-
}
@@ -226,5 +231,25 @@
}
+ /**
+ * 鍒濆鍖栦笁鏂圭浉鍏砈DK
+ * 灏忕背骞冲彴涓婄嚎锛岄渶瑕佸厛鍚屾剰鍚庯紝鍦ㄥ垵濮嬪寲鏋佸厜SDK,鍚﹀垯骞冲彴瀹℃牳涓嶈閫氳繃
+ */
+ private void initSdk() {
+ if (HDLApp.getInstance().isStartInitThirdSDK) {
+ return;
+ }
+ HDLApp.getInstance().isStartInitThirdSDK = true;
+ //鍒濆鍖栨瀬鍏夋帹閫�
+ initJPush();
+ }
+
+ /**
+ * 鍒濆鍖栨瀬鍏塖DK
+ */
+ private void initJPush() {
+ JPushInterface.setDebugMode(true);
+ JPushInterface.init(getBaseContext());
+ }
}
--
Gitblit v1.8.0