2025年07月14日14:57:30

wjc

昨天 e0a5ebeb7ab4480a89cc22bc1093cea71046edd7

2025年07月14日14:57:30

 app/src/main/java/com/hdl/photovoltaic/HDLApp.java

@@ -20,6 +20,7 @@
import com.google.gson.Gson;
import com.hdl.hdlhttp.HxHttpConfig;
import com.hdl.linkpm.sdk.HDLLinkPMSdk;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.linkpm.sdk.user.callback.IOnReloginListener;
import com.hdl.linkpm.sdk.utils.HDLSDKSPUtils;
@@ -28,6 +29,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.NetworkType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
@@ -234,6 +236,7 @@
        HDLLinkPMUser.getInstance().setOnReloginListener(new IOnReloginListener() {
            @Override
            public void onReLogin(int type) {

                if (100 == type) {
                    new Handler().postDelayed(new Runnable() {
                        @Override
@@ -246,6 +249,8 @@
                    }, 500);
                } else {
                    HdlLogLogic.print("监听到登录退出---" + type, true);
                    //删除推送Token
//                    HdlResidenceLogic.getInstance().pushDel(null);
                    //type:  0:正常退出   1：极光推送强制退出
                    //收到登录处理通知，关闭所有页面并打开登录页面
                    AppManagerUtils.getAppManager().finishAllActivity();

 app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java

@@ -4,6 +4,8 @@

    //添加推送Token
    public static final String POST_push_add = "/smart-footstone/app/push-information/add";
    //删除推送Token
    public static final String POST_push_del = "/smart-footstone/app/push-information/delete";

    //region **********【B端】和【C端】共用接口**********
    //mqtt连接需要（语雀接口地址:https://hdl-gz.yuque.com/wnkbmh/cdrglh/totdnt#40b28997）

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

@@ -19,6 +19,7 @@
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 +816,25 @@
    }

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

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

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

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

@@ -11,6 +11,7 @@
import com.hdl.photovoltaic.jpush.JPushMessageInfoBean;
import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

import org.greenrobot.eventbus.EventBus;
@@ -49,7 +50,7 @@
    public void JpushPushCommonData(Context context, JPushMessageInfoBean jPushMessageInfoBean, boolean isOpened) {
        if (UserConfigManage.getInstance().isBAccount()) {
            //添加推送数据到缓存列表中;
            this.addPushDataToMemoryList(jPushMessageInfoBean);
//            this.addPushDataToMemoryList(jPushMessageInfoBean);
            if (isOpened) {
                //安装商跳转界面
                Intent intent = new Intent(context, BPowerStationActivity.class);
@@ -100,6 +101,11 @@
     */
    private void addPushDataToMemoryList(JPushMessageInfoBean jPushMessageInfoBean) {
        try {
            boolean isPushAddCache = SharedPreUtils.getBoolean("pushAddCache");
            if (!isPushAddCache) {
                //有可能删除推送Token接口失败，换账号后，依然也会收到上次账号的推送;
                return;
            }
            if (TextUtils.isEmpty(jPushMessageInfoBean.getExpantContent())) {
                return;
            }

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

@@ -1119,6 +1119,37 @@

    }

    /**
     * 删除推送Token
     *
     * @param cloudCallBeak -
     */
    public void pushDel(CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.POST_push_del;
        JsonObject json = new JsonObject();
        json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
        json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(jsonStr);
                }

            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });


    }

    public static class HouseBeanClass {

        //总条数

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

@@ -714,7 +714,8 @@
                    //uni通知原生退出登录
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
                        HdlLogLogic.print("uni通知原生退出登录---", true);
                        HDLLinkPMUser.getInstance().logout(0);
//                        HDLLinkPMUser.getInstance().logout(0);
                        HdlAccountLogic.getInstance().logout();
                    }
                    break;
                    //本地密钥获取

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

@@ -282,14 +282,15 @@
                    }
                }
                if (!TextUtils.isEmpty(registrationID)) {
                    UserConfigManage.getInstance().setRegistrationID(registrationID);
                    UserConfigManage.getInstance().Save();
//                    UserConfigManage.getInstance().setRegistrationID(registrationID);
//                    UserConfigManage.getInstance().Save();
                    String finalRegistrationID = registrationID;
                    HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
                        @Override
                        public void onSuccess(String pushId) {

                            if (!TextUtils.isEmpty(pushId)) {
                                UserConfigManage.getInstance().setRegistrationID(finalRegistrationID);
                                UserConfigManage.getInstance().setPushId(pushId);
                                UserConfigManage.getInstance().Save();
                            }

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

@@ -357,14 +357,15 @@
                    }
                }
                if (!TextUtils.isEmpty(registrationID)) {
                    UserConfigManage.getInstance().setRegistrationID(registrationID);
                    UserConfigManage.getInstance().Save();
//                    UserConfigManage.getInstance().setRegistrationID(registrationID);
//                    UserConfigManage.getInstance().Save();
                    String finalRegistrationID = registrationID;
                    HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
                        @Override
                        public void onSuccess(String pushId) {

                            if (!TextUtils.isEmpty(pushId)) {
                                UserConfigManage.getInstance().setRegistrationID(finalRegistrationID);
                                UserConfigManage.getInstance().setPushId(pushId);
                                UserConfigManage.getInstance().Save();
                            }

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java

@@ -124,7 +124,6 @@
     * @param newPsw 新密码
     */
    private void sendChangePassword(String oldPsw, String newPsw) {

        if (UserConfigManage.getInstance().isBAccount()) {
            //B端更改个人密码
            HdlAccountLogic.getInstance().updatePassword_B(oldPsw, newPsw, new CloudCallBeak<String>() {
@@ -132,7 +131,8 @@
                public void onSuccess(String str) {
                    HdlLogLogic.print("B端更改个人密码退出登录--->", true);
//                    HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_pws_reset_succeeded), 0);
                    HDLLinkPMUser.getInstance().logout(0);
//                    HDLLinkPMUser.getInstance().logout(0);
                    HdlAccountLogic.getInstance().logout();
                }

                @Override
@@ -146,7 +146,8 @@
                @Override
                public void onSuccess(String obj) {
                    HdlLogLogic.print("C端更改个人密码退出登录--->", true);
                    HDLLinkPMUser.getInstance().logout(0);
//                    HDLLinkPMUser.getInstance().logout(0);
                    HdlAccountLogic.getInstance().logout();


                }

 app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java

@@ -7,13 +7,17 @@

import androidx.annotation.Nullable;

import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
@@ -168,7 +172,8 @@
            public void Confirm() {
                dialog.dismiss();
                HdlLogLogic.print("设置界面退出登录---", true);
                HDLLinkPMUser.getInstance().logout(0);
                HdlAccountLogic.getInstance().logout();

            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {

 app/src/main/java/com/hdl/photovoltaic/ui/me/UnregisterActivity.java

@@ -113,7 +113,8 @@
            public void Confirm() {
                dialog.dismiss();
                HdlLogLogic.print("注销账号退出登录---", true);
                HDLLinkPMUser.getInstance().logout(0);
//                HDLLinkPMUser.getInstance().logout(0);
                HdlAccountLogic.getInstance().logout();
            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {

 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java

@@ -17,6 +17,7 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -176,7 +177,8 @@
                            HdlLogLogic.print("收到小程序通知,回调事件为null,无法回调事件并执行业务逻辑---event=" + event + "\r\n" + "data=" + data, true);
                            //有可能是系统回收掉activity导致回调为null，这样情况下强制返回登录界面；
                            //todo 长时间没响应将退出登录界面重新登录
                            HDLLinkPMUser.getInstance().logout(0);
//                            HDLLinkPMUser.getInstance().logout(0);
                            HdlAccountLogic.getInstance().logout();
                        }
                    }
                }