Merge branch 'master' into google

wjc

10 小时以前 f151e203da870dbe281defcb1daf84a1a38ecac1

 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java

@@ -33,6 +33,7 @@
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlPushLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
@@ -210,17 +211,6 @@
                        intent.setClass(HDLApp.getInstance(), StartActivity.class);
                        startActivity(intent);
                        viewBinding.homeLoginLanguageTv.setText(itemData.getTitle());
                        HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
                            @Override
                            public void onSuccess(String pushId) {
                                HdlLogLogic.print("添加令牌到云端 PushToken:" + UserConfigManage.getInstance().getPushToken() + " pushId:" + pushId, true);
                            }

                            @Override
                            public void onFailure(HDLException e) {
                                HdlLogLogic.print("添加令牌到云端失败 PushToken:" + UserConfigManage.getInstance().getPushToken() + " 错误：" + e.getMessage(), true);
                            }
                        });
                    }
                });
            }
@@ -433,13 +423,14 @@
                        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() + ")");
                                    }
                                }
//                                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() + ")");
//                                    }
//                                }
                                HdlThreadLogic.toast(_mActivity, e.getMsg());
                            } catch (Exception ee) {
                                HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
                            }
@@ -633,7 +624,7 @@
                        //设置字体颜色
                        ds.setColor(getResources().getColor(text_color, null));
                        // 去掉下划线
                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                        ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
                    }


@@ -656,7 +647,7 @@
                        //设置字体颜色
                        ds.setColor(getResources().getColor(text_color, null));
                        // 去掉下划线
                        ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                        ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
                    }

                }, startIndex2, endIndex2, 0);