2024年10月29日17:21:51

mac

2024-10-29 0582b05b1f9dc97a71a72e4784452e5a43510256

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

@@ -10,6 +10,7 @@
import android.location.Location;
import android.location.LocationManager;
import android.os.IBinder;
import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;

@@ -19,6 +20,7 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.link.error.HDLLinkCode;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
@@ -61,7 +63,6 @@
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
@@ -672,7 +673,7 @@
                        if (callback != null) {
                            uniSuccessCallback(type, jsonObject, callback);
                        }
                        HdlLogLogic.print("uni---log---" + localSecret, true);
                        HdlLogLogic.print("uni---log---本地密钥获取---" + localSecret, true);

                    }
                    break;
@@ -685,7 +686,7 @@
                            UserConfigManage.getInstance().Save();
                            //配置本地通信的信息
                            HDLLinkConfig.getInstance().setLocalSecret(local_encrypt);
                            HdlLogLogic.print("uni---log---" + local_encrypt, true);
                            HdlLogLogic.print("uni---log---本地密钥设置---" + local_encrypt, true);
                        }
                    }
                    break;
@@ -750,6 +751,7 @@
        HdlDeviceLogic.getInstance().getPasswordVerification(mac, password, new LinkCallBack<LocalResponse>() {
            @Override
            public void onSuccess(LocalResponse obj) {

                if (callback != null) {
                    uniCallbackData(type, obj.getObjects(), obj.getCode(), obj.getMsg(), callback);
                }
@@ -757,6 +759,7 @@

            @Override
            public void onError(HDLLinkException e) {

                if (callback != null) {
                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                }
@@ -799,7 +802,7 @@
                        HdlUniLogic.getInstance().openUniMP(path, null);
                    } else {
                        HouseIdBean houseIdBean = HouseIdList.get(0);//默认拿第一个
                        HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
                        HdlResidenceLogic.getInstance().switchHouse(houseIdBean,true);
                        JsonObject jsonObject = new JsonObject();
                        jsonObject.addProperty("homeId", houseIdBean.getHomeId());
                        jsonObject.addProperty("homeName", houseIdBean.getHomeName());