Merge branch 'master' into google

wjc

2 天以前 dcdd7495322c36bc41c7d18fa91dc8884bc976ef

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

@@ -13,6 +13,7 @@
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;
@@ -818,18 +819,18 @@
    /**
     * 退出登录
     */
    public void logout() {
    public void logout(LogoutType logoutType) {
        HdlResidenceLogic.getInstance().pushDel(new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String obj) {
//                SharedPreUtils.putBoolean("pushAddCache", true);
                HDLLinkPMUser.getInstance().logout(0);
                HDLLinkPMUser.getInstance().logout(logoutType.getValue());
            }

            @Override
            public void onFailure(HDLException e) {
//                SharedPreUtils.putBoolean("pushAddCache", false);
                HDLLinkPMUser.getInstance().logout(0);
                HDLLinkPMUser.getInstance().logout(logoutType.getValue());
            }
        });
    }
@@ -843,7 +844,7 @@
            UserConfigManage.getInstance().setTheSameLoginAccount(isUserId);//与上一个账号是否同一个
            //UserConfigManage.getInstance().getUserId()表示第一次安装登录
            if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserId()) && !UserConfigManage.getInstance().isTheSameLoginAccount()) {
                //不同账号,删除之前的旧账号日志信息;
                //不同账号,删除之前的旧账号信息;
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentUserRootPath());
                HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getUserFilePath());
                UserConfigManage.getInstance().setHomeId("");