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 | 98 ++++++++++++++++++++++++++++++------------------
1 files changed, 61 insertions(+), 37 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 12654b4..f952fc9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -8,7 +8,6 @@
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;
@@ -22,20 +21,20 @@
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.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;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.sdk.link.HDLLinkLocalSdk;
+import com.umeng.commonsdk.UMConfigure;
import java.util.List;
import cn.jpush.android.api.JPushInterface;
-import io.dcloud.common.util.RuningAcitvityUtil;
/**
@@ -54,6 +53,7 @@
getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰APP绗竴娆″惎鍔ㄦ彁鍓嶆彁绀恒�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�嬫墠鍏佽涓婄嚎
final String key = "is_login";
+ HDLUniMPSDKManager.isExistsActivity = false;
boolean isLogin = SharedPreUtils.getBoolean(key);
if (!isLogin) {
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
@@ -66,6 +66,7 @@
confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
+ confirmationCancelDialog.dismiss();
SharedPreUtils.putBoolean(key, false);
finish();
}
@@ -73,6 +74,7 @@
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
+ confirmationCancelDialog.dismiss();
initSdk();
SharedPreUtils.putBoolean(key, true);
Intent intent = new Intent();
@@ -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);
}
}
@@ -187,7 +195,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_38C494, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -210,7 +218,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_38C494, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -223,7 +231,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FFACACAC, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
@@ -240,8 +248,11 @@
return;
}
HDLApp.getInstance().isStartInitThirdSDK = true;
+ //鍒濆鍖栧弸鐩烻DK
+ initUMengSDK();
//鍒濆鍖栨瀬鍏夋帹閫�
initJPush();
+
}
/**
@@ -252,4 +263,17 @@
JPushInterface.init(getBaseContext());
}
+ /**
+ * 鍒濆鍖栧弸鐩烻DK锛屾姄闂��鏃ュ織
+ * 闆嗘垚鏁欑▼鍦板潃锛歨ttps://developer.umeng.com/docs/119267/detail/118588
+ */
+ private void initUMengSDK() {
+ UMConfigure.preInit(this, "6801aec0bc47b67d833fd76d", "XenterraSolar");
+ //appkey鍜宑hannl蹇呴』淇濇寔鍜岄鍒濆鍖栦竴鑷达紒锛侊紒
+ //deviceType锛氳澶囩被鍨嬶紝UMConfigure.DEVICE_TYPE_PHONE涓烘墜鏈恒�乁MConfigure.DEVICE_TYPE_BOX涓虹洅瀛�
+ //pushSecret锛歅ush鎺ㄩ�佷笟鍔＄殑secret
+ UMConfigure.init(this, "6801aec0bc47b67d833fd76d", "XenterraSolar", UMConfigure.DEVICE_TYPE_PHONE, "");
+ UMConfigure.setLogEnabled(false);//AppConfigManage.isDebug()
+ }
+
}
--
Gitblit v1.8.0