From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 7ccd5ff..f2163fb 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,16 @@
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;
/**
@@ -89,10 +84,18 @@
//鍒ゆ柇AccessToken鏄惁null
if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- openActivity(intent);
+ //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
+ boolean isAuthorization = SharedPreUtils.getBoolean("isAuthorization");
+ if (isAuthorization) {
+ //瀹夎鍟嗚烦杞晫闈�
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ openActivity(intent);
+ } else {
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, LoginActivity.class);
+ openActivity(intent);
+ }
} else {
//C绔敤鎴疯烦杞晫闈�
// showLoading();
@@ -189,7 +192,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_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -212,7 +215,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_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -225,7 +228,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
--
Gitblit v1.8.0