Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/java/com/hdl/photovoltaic/utils/LocalManageUtil.java

@@ -28,7 +28,7 @@
 */
public class LocalManageUtil {

    public static final String cn = "cn";//中文
    public static final String zh = "zh";//中文你
    public static final String en = "en";//英文

//    private static Locale mLocale;
@@ -140,13 +140,15 @@
        LanguageAdapter.ItemData zh = new LanguageAdapter.ItemData();
        zh.setState(false);
        zh.setTitle("简体中文");
        zh.setLanguage(LocalManageUtil.cn);
        zh.setLanguage(LocalManageUtil.zh);
        list.add(zh);
        LanguageAdapter.ItemData en = new LanguageAdapter.ItemData();
        en.setState(false);
        en.setTitle("English");
        en.setLanguage(LocalManageUtil.en);
        list.add(en);


        return list;
    }

@@ -189,7 +191,7 @@
//        Locale locale = context.getResources().getConfiguration().locale;
//        String language = locale.getLanguage();
        String language = UserConfigManage.getInstance().getCurrentAppLanguage();
        return language.equals(cn);
        return language.equals(zh);
    }

    public static List<NationBean> getNationBeans() {