Merge branch 'master' into google

wjc

2 天以前 dcdd7495322c36bc41c7d18fa91dc8884bc976ef

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

@@ -196,11 +196,11 @@
                listDialog.setItemOnclickListener(new ListDialogAdapter.OnclickListener() {
                    @Override
                    public void onClick(int position, LanguageAdapter.ItemData itemData) {
                        listDialog.dismiss();
                        UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
                        UserConfigManage.getInstance().Save();
                        //配置接口请求语言
                        HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
                        listDialog.dismiss();
                        AppManagerUtils.getAppManager().finishAllActivity();
                        Intent intent = new Intent();
                        intent.setClass(HDLApp.getInstance(), StartActivity.class);