2023年07月12日17:16:39

wjc

2023-07-12 823f534dff0da0b34f68e32cdfe2651d1bb81db3

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

@@ -9,15 +9,9 @@
import com.hdl.linkpm.sdk.user.bean.HDLUserRegionBean;
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.linkpm.sdk.user.callback.IRegionByAccountCallBack;
import com.hdl.linkpm.sdk.user.controller.HDLPMUserController;
import com.hdl.photovoltaic.ui.bean.LoginUserBean;
import com.hdl.photovoltaic.ui.bean.LoginUserRegionBean;
import com.hdl.photovoltaic.bean.HttpResponsePack;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;

import java.util.regex.Matcher;
@@ -54,7 +48,7 @@
     * @param i_account 账号
     */
    public void regionByAccount(String i_account, CloudCallBeak<HDLUserRegionBean> cloudCallBeak) {
        HDLPMUserController.getInstance().regionByAccount(i_account, new IRegionByAccountCallBack() {
        HDLLinkPMUser.getInstance().regionByAccount(i_account, new IRegionByAccountCallBack() {
            @Override
            public void onSuccess(HDLUserRegionBean regionBean) {
                if (cloudCallBeak != null) {
@@ -86,11 +80,12 @@
        json.addProperty("loginPwd", loginPwd);
//        json.addProperty("platform", "APP");
        json.addProperty("grantType", "password");
        HDLPMUserController.getInstance().loginByPassword(account, loginPwd, new ILoginCallBack() {
        HDLLinkPMUser.getInstance().loginByPassword(account, loginPwd, new ILoginCallBack() {
            @Override
            public void onSuccess(HDLLoginBean loginBean) {

                if (callBack != null) {
                    saveUserData(loginBean);
                    callBack.onSuccess(loginBean);
                }
            }
@@ -102,27 +97,7 @@
                }
            }
        });
//        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
//            @Override
//            public void onSuccess(HttpResponsePack httpResponsePack) {
//                if (httpResponsePack != null && httpResponsePack.getData() != null) {
//                    Gson gson = new Gson();
//                    String json = gson.toJson(httpResponsePack.getData());
//                    LoginUserBean loginUserBean = new Gson().fromJson(json, LoginUserBean.class);
//                    saveUserData(loginUserBean);
//                    if (cloudCallBeak != null) {
//                        cloudCallBeak.onSuccess(loginUserBean);
//                    }
//                }
//            }
//
//            @Override
//            public void onFailure(Exception exception) {
//                if (cloudCallBeak != null) {
//                    cloudCallBeak.onFailure(exception);
//                }
//            }
//        });

    }

    /**
@@ -132,30 +107,26 @@
     * @param loginPwd      密码
     * @param cloudCallBeak -
     */
    public void refreshToken(String account, String loginPwd, CloudCallBeak<LoginUserBean> cloudCallBeak) {
    public void refreshToken(String account, String loginPwd, CloudCallBeak<HDLLoginBean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Login;
        JsonObject json = new JsonObject();
        json.addProperty("grantType", "refresh_token");
//        json.addProperty("refreshToken", UserConfigManage.getInstance().getRefreshToken());

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(HttpResponsePack httpResponsePack) {
                if (httpResponsePack != null && httpResponsePack.getData() != null) {
                    Gson gson = new Gson();
                    String json = gson.toJson(httpResponsePack.getData());
                    LoginUserBean loginUserBean = new Gson().fromJson(json, LoginUserBean.class);
                    saveUserData(loginUserBean);
                    if (cloudCallBeak != null) {
                        cloudCallBeak.onSuccess(loginUserBean);
                    }
            public void onSuccess(String jsonStr) {
                Gson gson = new Gson();
                HDLLoginBean loginBean = gson.fromJson(jsonStr, HDLLoginBean.class);
//                    saveUserData(loginBean);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(loginBean);
                }
            }

            @Override
            public void onFailure(Exception exception) {
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(exception);
                    cloudCallBeak.onFailure(e);
                }
            }
        });
@@ -184,7 +155,7 @@
    /**
     * 登录成功保存登录信息
     */
    private void saveUserData(LoginUserBean obj) {
    private void saveUserData(HDLLoginBean obj) {
        if (obj != null) {
            UserConfigManage.getInstance().setLogin(true);//是否登录
            UserConfigManage.getInstance().setAcceiptPolicy(true);//是否选择隐私政策