2024年10月18日10:50:08

mac

2024-10-18 8952a126eb8080f15d031d77e108700f85552074

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

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

@@ -34,16 +32,12 @@
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.DeviceInfoBean;
@@ -74,10 +68,10 @@
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
import com.hdl.sdk.link.core.callback.ModbusCallBack;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import com.huawei.hms.api.Api;

import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -96,7 +90,6 @@
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;

import io.dcloud.feature.sdk.DCUniMPSDK;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
import okhttp3.ResponseBody;

@@ -166,8 +159,16 @@
                        jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
                        jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
                        jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
                        uniSuccessCallback(mode_type, jsonObject, callback);

                        jsonObject.addProperty("token", HDLLinkPMUser.getInstance().getAccessToken());
                        jsonObject.addProperty("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
                        if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
                            AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
                        }
                        jsonObject.addProperty("serverAddress", AppConfigManage.getUserRegionUrl());
                        jsonObject.addProperty("appKey", AppConfigManage.getAppKey());
                        jsonObject.addProperty("appSecret", AppConfigManage.getAppSecret());
                        uniSuccessCallback(mode_type, jsonObject, callback);
                    }
                    break;
                }
@@ -263,7 +264,6 @@

                    }
                    break;


                }

@@ -529,9 +529,17 @@
                    break;
                    //消息中心
                    case HDLUniMP.UNI_EVENT_REPLY_MINE_MESSAGE_CENTER: {
                        String homeId = getKeyValue("homeId", getKeyValue("data", data));
                        String isShowFault = getKeyValue("isShowFault", getKeyValue("data", data));
                        Intent intent = new Intent();
                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                        intent.setClass(HDLApp.getInstance(), MessageCenterList.class);
                        if (!TextUtils.isEmpty(homeId)) {
                            intent.putExtra("homeId", homeId);
                        }
                        if (!TextUtils.isEmpty(isShowFault)) {
                            intent.putExtra("isShowFault", isShowFault);
                        }
                        HDLApp.getInstance().startActivity(intent);
                    }
                    break;
@@ -662,6 +670,30 @@
                    //uni通知原生退出登录
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
                        HDLLinkPMUser.getInstance().logout(0);
                    }
                    break;
                    //本地密钥获取
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_GET: {
                        String localSecret = HDLLinkConfig.getInstance().getLocalSecret();
                        JsonObject jsonObject = new JsonObject();
                        jsonObject.addProperty("local_encrypt", localSecret);
                        if (callback != null) {
                            uniSuccessCallback(type, jsonObject, callback);
                        }
                        HdlLogLogic.print("uni---log---" + localSecret, true);

                    }
                    break;
                    //本地密钥设置
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_SET: {
                        String local_encrypt = getKeyValue("local_encrypt", getKeyValue("data", data));
                        //重新设置本地通讯秘钥
                        UserConfigManage.getInstance().setLocalSecret(local_encrypt);
                        UserConfigManage.getInstance().Save();
                        //配置本地通信的信息
                        HDLLinkConfig.getInstance().setLocalSecret(local_encrypt);
                        HdlLogLogic.print("uni---log---" + local_encrypt, true);

                    }
                    break;
                }
@@ -1196,7 +1228,9 @@
     */
    private void uniGetCurrentDeviceFirmwares(String type, Object data, DCUniMPJSCallback callback) {
        String deviceOidId = getKeyValue("deviceOidId", getKeyValue("data", data));//云端上设备id
        HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
        String oid = getKeyValue("oid", getKeyValue("data", data));//设备oid
        String homeId = getKeyValue("homeId", getKeyValue("data", data));//电站id
        HdlOtaLogic.getInstance().getCurrentDeviceFirmwares(deviceOidId, oid, homeId, new CloudCallBeak<List<DeviceFirmwareBean>>() {
            @Override
            public void onSuccess(List<DeviceFirmwareBean> obj) {
                uniSuccessCallback(type, obj, callback);
@@ -1447,7 +1481,8 @@
     */
    private void uniGetCurrentGatewayDrivers(String type, Object data, DCUniMPJSCallback callback) {
        String deviceOid = getKeyValue("oid", getKeyValue("data", data));
        HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, new CloudCallBeak<List<GatewayDriverBean>>() {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));//电站id
        HdlOtaLogic.getInstance().getCurrentGatewayDrivers(deviceOid, homeId, new CloudCallBeak<List<GatewayDriverBean>>() {
            @Override
            public void onSuccess(List<GatewayDriverBean> obj) {
                uniSuccessCallback(type, obj, callback);
@@ -2591,8 +2626,8 @@
            }
            if (isTokenAndRefreshToken) {
                //小程序那里有自己的请求方法,但需要原生提供这些数据
                data.put("token", UserConfigManage.getInstance().getToken());
                data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
                data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
                data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
                if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
                    AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
                }