Merge branch 'master' into 2.0

wjc

4 天以前 8f4a21c13de88f6c34705f0660ec54ec5e032aa4

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

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


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

                }, startIndex2, endIndex2, 0);