Merge branch '1.3.1'

wjc

2 天以前 53057d6bbf444fe630debd9f043d4ce4ad22279b

 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java

@@ -13,12 +13,14 @@
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.AuthorizationAccountBean;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.utils.SharedPreUtils;

import java.io.File;
import java.lang.reflect.Type;
@@ -815,6 +817,25 @@
    }

    /**
     * 退出登录
     */
    public void logout(LogoutType logoutType) {
        HdlResidenceLogic.getInstance().pushDel(new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String obj) {
//                SharedPreUtils.putBoolean("pushAddCache", true);
                HDLLinkPMUser.getInstance().logout(logoutType.getValue());
            }

            @Override
            public void onFailure(HDLException e) {
//                SharedPreUtils.putBoolean("pushAddCache", false);
                HDLLinkPMUser.getInstance().logout(logoutType.getValue());
            }
        });
    }

    /**
     * 登录成功保存登录信息
     */
    private void saveUserData(HDLLoginBean obj) {