Merge branch 'master' into 1.2.1_google

wjc

2 天以前 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

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

@@ -147,6 +147,8 @@
        en.setTitle("English");
        en.setLanguage(LocalManageUtil.en);
        list.add(en);


        return list;
    }