From 59340c0b9107c813d6b3a5c953d693212485ad11 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 20 八月 2025 13:31:22 +0800
Subject: [PATCH] 2025年08月20日13:31:14
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 84 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 930817f..cfb88e9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -12,6 +12,7 @@
import android.text.method.LinkMovementMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
+import android.view.Gravity;
import android.view.View;
import android.widget.TextView;
@@ -30,7 +31,9 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
@@ -40,6 +43,8 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.me.WebActivity;
+import com.hdl.photovoltaic.uni.HDLUniMP;
+import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
@@ -96,7 +101,6 @@
//
// });
-
}
/**
@@ -106,7 +110,7 @@
try {
viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
- setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
+ setStringDifferentColors(viewBinding.homeLoginPrivacyTv, true);
//娉ㄥ唽鍜屽繕璁板瘑鐮侀渶瑕佸姞涓嬪垝绾�
String registerTvStr = viewBinding.homeLoginRegisterTv.getText().toString();
@@ -171,6 +175,13 @@
// viewBinding.homeLoginPasswordEt.setText(pws);
checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
isLoginTextViewEnabled();
+ if (UserConfigManage.getInstance().isAutomaticSkipNoNetworkFlag()) {
+ SharedPreUtils.putBoolean("no_network_mode", true);
+ UserConfigManage.getInstance().setNoNetworkFlag(true);
+ UserConfigManage.getInstance().Save();
+ String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
} catch (Exception ignored) {
}
}
@@ -191,11 +202,11 @@
listDialog.setItemOnclickListener(new ListDialogAdapter.OnclickListener() {
@Override
public void onClick(int position, LanguageAdapter.ItemData itemData) {
+ listDialog.dismiss();
UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
UserConfigManage.getInstance().Save();
//閰嶇疆鎺ュ彛璇锋眰璇█
HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
- listDialog.dismiss();
AppManagerUtils.getAppManager().finishAllActivity();
Intent intent = new Intent();
intent.setClass(HDLApp.getInstance(), StartActivity.class);
@@ -263,7 +274,7 @@
viewBinding.homeLoginTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
+ HDLUniMPSDKManager.isExistsActivity = false;
String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
boolean is_login = isLocalCheckAccountAndPassword(account, password);
@@ -310,6 +321,13 @@
startActivity(intent);
}
});
+ //鏃犵綉妯″紡
+ viewBinding.homeNoNetworkModeLoginTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ noNetworkMode();
+ }
+ });
}
@@ -324,6 +342,7 @@
HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
@Override
public void onSuccess(HDLUserRegionBean obj) {
+ HdlLogLogic.print("璐﹀彿鐧诲綍鎴愬姛---" + account, true);
//寮�鍙戠幆澧�
// String APP_REGIONURL_TEST = "http://47.114.131.143:27197";
// AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
@@ -433,6 +452,46 @@
}
/**
+ * 杩涘叆鏃犵綉妯″紡
+ */
+ private void noNetworkMode() {
+ boolean isNoNetworkModeLogin = SharedPreUtils.getBoolean("no_network_mode");
+ if (!isNoNetworkModeLogin) {
+ //绗竴娆℃墦寮�瑕佹彁绀�
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip));
+ confirmationCancelDialog.setContent(getString(R.string.no_network_mode_tip));
+ confirmationCancelDialog.setConfirmation(getString(R.string.home_login_affirm));
+ confirmationCancelDialog.setCancel(getString(R.string.scan_cancel));
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.getContentTextView().setGravity(Gravity.START);
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationCancelDialog.dismiss();
+ SharedPreUtils.putBoolean("no_network_mode", false);
+ }
+ });
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationCancelDialog.dismiss();
+ SharedPreUtils.putBoolean("no_network_mode", true);
+ UserConfigManage.getInstance().setNoNetworkFlag(true);
+ UserConfigManage.getInstance().Save();
+ String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
+ });
+ } else {
+ UserConfigManage.getInstance().setNoNetworkFlag(true);
+ UserConfigManage.getInstance().Save();
+ String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
+ }
+
+ /**
* 鏍￠獙鐧诲綍鎸夐挳鏄惁鍚敤
*/
private void isLoginTextViewEnabled() {
@@ -517,12 +576,13 @@
/**
* 璁剧疆涓�涓插瓧绗﹀绉嶉鑹蹭互鍙婄偣鍑讳簨浠�
*
- * @param textView 褰撳墠缁勪欢
+ * @param textView 褰撳墠缁勪欢
+ * @param isHighlight 鏄惁楂樹寒锛坱rue琛ㄧず楂樹寒锛�
*/
- private void setStringDifferentColors(TextView textView) {
+ private void setStringDifferentColors(TextView textView, boolean isHighlight) {
try {
-
+ int text_color = isHighlight ? R.color.text_38C494 : R.color.text_FFACACAC;
if (textView == null) {
return;
}
@@ -560,8 +620,9 @@
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
+
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
+ ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -584,11 +645,10 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
+ ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
-
}, startIndex2, endIndex2, 0);
// spannable.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), startIndex2, endIndex2, 0);
@@ -597,7 +657,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FFACACAC, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
@@ -615,7 +675,7 @@
confirmationCancelDialog.show();
confirmationCancelDialog.isHideTitle(true);
confirmationCancelDialog.setContent(getString(R.string.loading_privacy_server));
- setStringDifferentColors(confirmationCancelDialog.getContentTextView());
+ setStringDifferentColors(confirmationCancelDialog.getContentTextView(), true);
confirmationCancelDialog.setConfirmation(getString(R.string.loading_agree));
confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
--
Gitblit v1.8.0