From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 543 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 328 insertions(+), 215 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 870b1d7..d349ca9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -30,6 +30,7 @@
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.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
@@ -40,11 +41,12 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.me.WebActivity;
+import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
+import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.photovoltaic.widget.ConfirmationCancelDialog1;
import com.hdl.photovoltaic.widget.ListDialog;
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
@@ -59,8 +61,6 @@
@Override
public Object getContentView() {
-
- setNotificationBarBackgroundColor(CustomColor.blue);
viewBinding = ActivityHomeLoginBinding.inflate(getLayoutInflater());
return viewBinding.getRoot();
}
@@ -68,6 +68,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_00000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -104,29 +105,76 @@
* 鍒濆鍖朥I
*/
private void initView() {
- viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
- viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
- setStringDifferentColors(viewBinding.homeLoginPrivacyTv);
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
- viewBinding.homeLoginLanguageTv.setText("绠�浣撲腑鏂�");
- } else {
- viewBinding.homeLoginLanguageTv.setText("English");
- }
- if (UserConfigManage.getInstance().isBAccount()) {
- viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
- } else {
- viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
- }
+ try {
+ viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
+ viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
+ setStringDifferentColors(viewBinding.homeLoginPrivacyTv, false);
- String acc = "18402017839";
+ //娉ㄥ唽鍜屽繕璁板瘑鐮侀渶瑕佸姞涓嬪垝绾�
+ String registerTvStr = viewBinding.homeLoginRegisterTv.getText().toString();
+ String forgetPasswordTvStr = viewBinding.homeLoginForgetPasswordTv.getText().toString();
+ SpannableStringBuilder registerTvStrSpannable = new SpannableStringBuilder(registerTvStr);
+ registerTvStrSpannable.setSpan(new ClickableSpan() {
+ @Override
+ public void onClick(@NonNull View widget) {
+
+ }
+
+ @Override
+ public void updateDrawState(@NonNull TextPaint ds) {
+ super.updateDrawState(ds);
+ //璁剧疆瀛椾綋棰滆壊
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
+ // 鍘绘帀涓嬪垝绾�
+ ds.setUnderlineText(true);
+ }
+
+
+ }, 0, registerTvStr.length(), 0);
+ viewBinding.homeLoginRegisterTv.setText(registerTvStrSpannable);
+
+ SpannableStringBuilder forgetPasswordTvStrSpannable = new SpannableStringBuilder(forgetPasswordTvStr);
+ forgetPasswordTvStrSpannable.setSpan(new ClickableSpan() {
+ @Override
+ public void onClick(@NonNull View widget) {
+
+ }
+
+ @Override
+ public void updateDrawState(@NonNull TextPaint ds) {
+ super.updateDrawState(ds);
+ //璁剧疆瀛椾綋棰滆壊
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
+ // 鍘绘帀涓嬪垝绾�
+ ds.setUnderlineText(true);
+ }
+
+
+ }, 0, forgetPasswordTvStr.length(), 0);
+ viewBinding.homeLoginForgetPasswordTv.setText(forgetPasswordTvStrSpannable);
+
+
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
+ viewBinding.homeLoginLanguageTv.setText("绠�浣撲腑鏂�");
+ } else {
+ viewBinding.homeLoginLanguageTv.setText("English");
+ }
+ if (UserConfigManage.getInstance().isBAccount()) {
+ viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
+ } else {
+ viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
+ }
+// String acc = "18402017839";
// String acc = "13375012441";
// String acc = "18316672920";
-// String acc = "nuy13368@uzxia.com";
- String pws = "123456";
- //娴嬭瘯鐢�
- viewBinding.homeLoginAccountEt.setText(acc);
- viewBinding.homeLoginPasswordEt.setText(pws);
- isLoginTextViewEnabled();
+// String pws = "123456";
+ //娴嬭瘯鐢�
+ viewBinding.homeLoginAccountEt.setText(UserConfigManage.getInstance().getAccount());
+// viewBinding.homeLoginPasswordEt.setText(pws);
+ checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
+ isLoginTextViewEnabled();
+ } catch (Exception ignored) {
+ }
}
/**
@@ -134,14 +182,9 @@
*/
private void initEvent() {
- viewBinding.homeLoginMoreIv.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- HdlThreadLogic.toast(_mActivity, getString(R.string.loading_not_supported));
- }
- });
+
//璇█閫夋嫨
- viewBinding.homeLoginLanguageTv.setOnClickListener(new View.OnClickListener() {
+ viewBinding.homeLoginLanguageLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ListDialog listDialog = new ListDialog(_mActivity);
@@ -165,15 +208,18 @@
}
});
+ //杈撳叆璐﹀彿
viewBinding.homeLoginAccountEt.addTextChangedListener(accountTextWatcher);
+ //娓呴櫎璐﹀彿鎸夐挳
viewBinding.homeLoginClearContentsIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
viewBinding.homeLoginAccountEt.setText("");
}
});
-
+ //杈撳叆瀵嗙爜
viewBinding.homeLoginPasswordEt.addTextChangedListener(passwordTextWatcher);
+ //瀵嗙爜闅愯棌鎸夐挳
viewBinding.homeLoginHideIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -201,7 +247,7 @@
UserConfigManage.getInstance().setBAccount(v.isSelected());
viewBinding.homeLoginCheckBCIv.setSelected(UserConfigManage.getInstance().isBAccount());
if (UserConfigManage.getInstance().isBAccount()) {
- viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
+ viewBinding.homeLoginRegisterTv.setVisibility(View.INVISIBLE);
} else {
viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
@@ -219,7 +265,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);
@@ -229,94 +275,11 @@
boolean isSelected = UserConfigManage.getInstance().isAcceiptPolicy();
if (!isSelected) {
//闅愮鍗忚鎻愮ず
- getDialog();
+ getAcceiptPolicyDialog();
return;
}
- showLoading(getString(R.string.home_login_be_logging_in));
- HdlAccountLogic.getInstance().regionByAccount(account, new CloudCallBeak<HDLUserRegionBean>() {
- @Override
- public void onSuccess(HDLUserRegionBean obj) {
- //寮�鍙戠幆澧�
-// String APP_REGIONURL_TEST = "http://47.114.131.143:27199";
-// AppConfigManage.setUserRegionUrl(APP_REGIONURL_TEST);
- //鍒濆鍖栨湇鍔″煙鍚�
- AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
- HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
- HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
- @Override
- public void onSuccess(HDLLoginBean obj) {
- if (UserConfigManage.getInstance().isBAccount()) {
- restoreButtonStyleToInitializeState();
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- hideLoading();
- finish();
- } else {
- //C绔渶瑕佸厛鑾峰彇鐢电珯鍒楄〃;
- HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
- @Override
- public void onSuccess(List<HouseIdBean> obj) {
- hideLoading();
- HdlResidenceLogic.getInstance().setHouseIdList(obj);
- restoreButtonStyleToInitializeState();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
- startActivity(CPowerStationActivity.class);
-
- }
- finish();
- }
-
- @Override
- public void onFailure(HDLException e) {
- hideLoading();
- restoreButtonStyleToInitializeState();
- if (UserConfigManage.getInstance().isBAccount()) {
- //瀹夎鍟嗚烦杞晫闈�
- startActivity(BPowerStationActivity.class);
- } else {
- //C绔敤鎴疯烦杞晫闈�
- startActivity(CPowerStationActivity.class);
- }
- finish();
- }
- });
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- hideLoading();
- if (e.getCode() == 10019) {
- //鐢ㄦ埛宸茬粡琚攣瀹氶敊璇爜
- try {
- if (e.getmExtra() != null) {
- if (System.currentTimeMillis() < e.getmExtra().getUnlockTime()) {
- long time = e.getmExtra().getUnlockTime() - System.currentTimeMillis();
- int minute = Integer.parseInt(TimeUtils.getMinuteTime(time));
- HdlThreadLogic.toast(_mActivity, e.getMsg() + getString(R.string.residue) + minute + getString(R.string.minute) + "(" + e.getCode() + ")");
- }
- }
- } catch (Exception ee) {
- HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
- }
-
- } else {
- HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
- }
- }
- });
- }
-
- @Override
- public void onFailure(HDLException e) {
- hideLoading();
- HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
- }
- });
+ //鐧诲綍
+ loginAccount(account, password);
}
@@ -353,20 +316,160 @@
}
/**
+ * 鐧诲綍
+ *
+ * @param account 璐﹀彿
+ * @param password 瀵嗙爜
+ */
+ private void loginAccount(String account, String password) {
+ showLoading(getString(R.string.home_login_be_logging_in));
+ 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);
+ //鍒濆鍖栨湇鍔″煙鍚�
+ AppConfigManage.setUserRegionUrl(obj.getRegionUrl());
+ HDLLinkPMUser.getInstance().setUserRegionUrl(AppConfigManage.getUserRegionUrl());
+ HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
+ @Override
+ public void onSuccess(HDLLoginBean obj) {
+ if (UserConfigManage.getInstance().isBAccount()) {
+ restoreButtonStyleToInitializeState();
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ hideLoading();
+ finish();
+ //浜戠杩樻病鏈夊尮閰嶅钩鍙板ソ锛屽厛闅愯棌鏍￠獙璐﹀彿鍔熻兘 2025骞�03鏈�24鏃�15:16:37
+// HdlAccountLogic.getInstance().getCompanyParterMenu_B(new CloudCallBeak<Boolean>() {
+// @Override
+// public void onSuccess(Boolean isBoolean) {
+// if (isBoolean) {
+// //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
+// restoreButtonStyleToInitializeState();
+// //瀹夎鍟嗚烦杞晫闈�
+// startActivity(BPowerStationActivity.class);
+// hideLoading();
+// finish();
+// } else {
+// hideLoading();
+// HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
+// }
+// }
+//
+// @Override
+// public void onFailure(HDLException e) {
+// hideLoading();
+// HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+// }
+// });
+
+ } else {
+ //C绔渶瑕佸厛鑾峰彇鐢电珯鍒楄〃;
+ HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ @Override
+ public void onSuccess(List<HouseIdBean> obj) {
+ hideLoading();
+ HdlResidenceLogic.getInstance().setHouseIdList(obj);
+ restoreButtonStyleToInitializeState();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+
+ }
+ finish();
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ hideLoading();
+ restoreButtonStyleToInitializeState();
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //瀹夎鍟嗚烦杞晫闈�
+ startActivity(BPowerStationActivity.class);
+ } else {
+ //C绔敤鎴疯烦杞晫闈�
+ startActivity(CPowerStationActivity.class);
+ }
+ finish();
+ }
+ });
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ hideLoading();
+ if (e.getCode() == 10019) {
+ //鐢ㄦ埛宸茬粡琚攣瀹氶敊璇爜
+ try {
+ if (e.getmExtra() != null) {
+ if (System.currentTimeMillis() < e.getmExtra().getUnlockTime()) {
+ long time = e.getmExtra().getUnlockTime() - System.currentTimeMillis();
+ int minute = Integer.parseInt(TimeUtils.getMinuteTime(time));
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + getString(R.string.residue) + minute + getString(R.string.minute) + "(" + e.getCode() + ")");
+ }
+ }
+ } catch (Exception ee) {
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+ }
+
+ } else {
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+ }
+ }
+ });
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ hideLoading();
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
+
+ }
+
+ /**
* 鏍￠獙鐧诲綍鎸夐挳鏄惁鍚敤
*/
private void isLoginTextViewEnabled() {
String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
boolean isEnabled = account.length() > 0 && password.length() > 0;
+ if (isEnabled) {
+ viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FFACACAC));
+ } else {
+ viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FF5B5B5B));
+ }
viewBinding.homeLoginTv.setEnabled(isEnabled);
if (password.length() < 6 || password.length() > 16) {
return;
}
//绗﹀悎瀵嗙爜瑙勫垯鍚庨殣钘忛敊璇彁绀猴紱
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_FF5A5A5A));
viewBinding.homeLoginPasswordTextErrorTv.setText("");
+ }
+
+ /**
+ * 妫�娴嬫竻闄ゅ浘鏍囨槸鍚︽樉绀�
+ */
+ private void checkClearIconShowOrNot(String s) {
+ if (s.replace(" ", "").length() > 0) {
+ if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.GONE) {
+ viewBinding.homeLoginClearContentsIv.setVisibility(View.VISIBLE);
+ }
+ } else {
+ if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.VISIBLE) {
+ viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
+ }
+ }
}
/**
@@ -379,19 +482,19 @@
*/
private boolean isLocalCheckAccountAndPassword(String account, String password) {
if (TextUtils.isEmpty(account)) {
- viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545));
+// viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_D34545));
viewBinding.homeLoginAccountTextErrorTv.setText(R.string.home_login_error_account_null);
return false;
}
if (TextUtils.isEmpty(password)) {
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_password_null);
return false;
}
if (password.length() < 6 || password.length() > 16) {
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_D34545));
viewBinding.homeLoginPasswordTextErrorTv.setText(R.string.home_login_error_6_16_str);
return false;
}
@@ -406,9 +509,9 @@
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
- viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+// viewBinding.homeLoginLine1V.setBackgroundColor(getColor(R.color.text_E1E1E1));
viewBinding.homeLoginAccountTextErrorTv.setText("");
- viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
+// viewBinding.homeLoginLine2V.setBackgroundColor(getColor(R.color.text_E1E1E1));
viewBinding.homeLoginPasswordTextErrorTv.setText("");
}
}, null, null);
@@ -417,78 +520,92 @@
/**
* 璁剧疆涓�涓插瓧绗﹀绉嶉鑹蹭互鍙婄偣鍑讳簨浠�
*
- * @param textView 褰撳墠缁勪欢
+ * @param textView 褰撳墠缁勪欢
+ * @param isHighlight 鏄惁楂樹寒锛坱rue琛ㄧず楂樹寒锛�
*/
- private void setStringDifferentColors(TextView textView) {
+ private void setStringDifferentColors(TextView textView, boolean isHighlight) {
+ try {
- if (textView == null) {
- return;
+ int text_color = isHighlight ? R.color.text_38C494 : R.color.text_FFACACAC;
+ if (textView == null) {
+ return;
+ }
+
+ String s = textView.getText().toString();
+ if (!s.contains("銆�")) {
+ return;
+ }
+
+ int startIndex1 = s.indexOf("銆�");
+ int endIndex1 = s.indexOf("銆�") + 1;
+
+
+ int startIndex2 = s.lastIndexOf("銆�");
+ int endIndex2 = s.lastIndexOf("銆�") + 1;
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ s = s.replace("銆�", "").replace("銆�", "");
+ endIndex1 -= 1;
+ startIndex2 -= 2;//绉婚櫎"銆�"鍜�"銆�"鎬婚暱搴﹀彂鐢熷彉鍖栵紝绱㈠紩涔熸敼鍙�;
+ endIndex2 -= 4;//绉婚櫎"銆�"鍜�"銆�"鎬婚暱搴﹀彂鐢熷彉鍖栵紝绱㈠紩涔熸敼鍙�;
+ }
+ SpannableStringBuilder spannable = new SpannableStringBuilder(s);
+ //璁剧疆鏂囧瓧鐨勫墠鏅壊
+ if (textView.getTag() != null && textView.getTag().toString().equals("click")) {
+ spannable.setSpan(new ClickableSpan() {
+ @Override
+ public void onClick(@NonNull View widget) {
+ //todo 闇�瑕佽烦杞埌鏈嶅姟鍗忚鐣岄潰
+ Intent intent = new Intent();
+ intent.putExtra("type", WebActivity.ServiceAgreement);
+ intent.setClass(_mActivity, WebActivity.class);
+ startActivity(intent);
+ }
+
+ @Override
+ public void updateDrawState(@NonNull TextPaint ds) {
+ super.updateDrawState(ds);
+
+ //璁剧疆瀛椾綋棰滆壊
+ ds.setColor(getResources().getColor(text_color, null));
+ // 鍘绘帀涓嬪垝绾�
+ ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ }
+
+
+ }, startIndex1, endIndex1, 0);
+// spannable.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), startIndex1, endIndex1, 0);
+
+ spannable.setSpan(new ClickableSpan() {
+ @Override
+ public void onClick(@NonNull View widget) {
+ //todo 闇�瑕佽烦杞埌闅愮鐣岄潰
+ Intent intent = new Intent();
+ intent.putExtra("type", WebActivity.PrivacyAgreement);
+ intent.setClass(_mActivity, WebActivity.class);
+ startActivity(intent);
+ }
+
+ @Override
+ public void updateDrawState(@NonNull TextPaint ds) {
+ super.updateDrawState(ds);
+ //璁剧疆瀛椾綋棰滆壊
+ 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);
+
+
+ }
+ textView.setText(spannable);
+ //涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
+ textView.setHighlightColor(getResources().getColor(R.color.text_FFACACAC, null));
+ //鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
+ textView.setMovementMethod(LinkMovementMethod.getInstance());
+ } catch (Exception ignored) {
}
-
- String s = textView.getText().toString();
- if (!s.contains("銆�")) {
- return;
- }
- int startIndex1 = s.indexOf("銆�");
- int endIndex1 = s.indexOf("銆�") + 1;
-
- int startIndex2 = s.lastIndexOf("銆�");
- int endIndex2 = s.lastIndexOf("銆�") + 1;
-
- SpannableStringBuilder spannable = new SpannableStringBuilder(s);
- //璁剧疆鏂囧瓧鐨勫墠鏅壊
- if (textView.getTag() != null && textView.getTag().toString().equals("click")) {
- spannable.setSpan(new ClickableSpan() {
- @Override
- public void onClick(@NonNull View widget) {
- //todo 闇�瑕佽烦杞埌鏈嶅姟鍗忚鐣岄潰
- Intent intent = new Intent();
- intent.putExtra("type", WebActivity.ServiceAgreement);
- intent.setClass(_mActivity, WebActivity.class);
- startActivity(intent);
- }
-
- @Override
- public void updateDrawState(@NonNull TextPaint ds) {
- super.updateDrawState(ds);
- //璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_245EC3, null));
- // 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(false);
- }
-
-
- }, startIndex1, endIndex1, 0);
-
- spannable.setSpan(new ClickableSpan() {
- @Override
- public void onClick(@NonNull View widget) {
- //todo 闇�瑕佽烦杞埌闅愮鐣岄潰
- Intent intent = new Intent();
- intent.putExtra("type", WebActivity.PrivacyAgreement);
- intent.setClass(_mActivity, WebActivity.class);
- startActivity(intent);
- }
-
- @Override
- public void updateDrawState(@NonNull TextPaint ds) {
- super.updateDrawState(ds);
- //璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_245EC3, null));
- // 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(false);
- }
-
-
- }, startIndex2, endIndex2, 0);
-
-
- }
- textView.setText(spannable);
- //涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_00000000, null));
- //鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
- textView.setMovementMethod(LinkMovementMethod.getInstance());
}
@@ -496,28 +613,32 @@
/**
* 寮圭獥
*/
- private void getDialog() {
- ConfirmationCancelDialog1 dialog = new ConfirmationCancelDialog1(_mActivity);
- dialog.show();
-// dialog.setTitle(getString(R.string.loading_privacy));
- dialog.isHideTitle(true);
- dialog.setContent(getString(R.string.loading_privacy_server));
- setStringDifferentColors(dialog.getContentTextView());
- dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ private void getAcceiptPolicyDialog() {
+
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.isHideTitle(true);
+ confirmationCancelDialog.setContent(getString(R.string.loading_privacy_server));
+ setStringDifferentColors(confirmationCancelDialog.getContentTextView(), true);
+ confirmationCancelDialog.setConfirmation(getString(R.string.loading_agree));
+ confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
-
UserConfigManage.getInstance().setAcceiptPolicy(true);
viewBinding.homeLoginPrivacyCheckIv.setSelected(true);
- dialog.dismiss();
+ confirmationCancelDialog.dismiss();
+ String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
+ String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
+ loginAccount(account, password);
}
});
- dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
UserConfigManage.getInstance().setAcceiptPolicy(false);
viewBinding.homeLoginPrivacyCheckIv.setSelected(false);
- dialog.dismiss();
+ confirmationCancelDialog.dismiss();
}
});
@@ -538,15 +659,7 @@
@Override
public void afterTextChanged(Editable s) {
- if (s.length() > 0) {
- if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.GONE) {
- viewBinding.homeLoginClearContentsIv.setVisibility(View.VISIBLE);
- }
- } else {
- if (viewBinding.homeLoginClearContentsIv.getVisibility() == View.VISIBLE) {
- viewBinding.homeLoginClearContentsIv.setVisibility(View.GONE);
- }
- }
+ checkClearIconShowOrNot(s.toString());
isLoginTextViewEnabled();
}
};
--
Gitblit v1.8.0