blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
mac
2023-12-22 c48f6e1e7f7fc4ca3db8ecadf441d6da942ceb8f 
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java


@@ -28,6 +28,7 @@


import com.hdl.photovoltaic.uni.HDLUniMP;


import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;


import com.hdl.photovoltaic.utils.AppManagerUtils;


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;


@@ -97,9 +98,9 @@


                switch (type) {


                    //创建电站


                    case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {




                        //EventBus事件分发


                        BaseEventBus baseEventBus = new BaseEventBus();


                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL);


                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION);


                        baseEventBus.setData(getKeyValue("data", data));


                        EventBus.getDefault().post(baseEventBus);


@@ -115,6 +116,16 @@


                        //EventBus事件分发


                        BaseEventBus baseEventBus = new BaseEventBus();


                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE);


                        baseEventBus.setData(getKeyValue("data", data));


                        EventBus.getDefault().post(baseEventBus);


                    }


                    break;


                    //住宅【电站】编辑


                    case HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT: {


                        //EventBus事件分发


                        BaseEventBus baseEventBus = new BaseEventBus();


                        baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL);


                        baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT);


                        baseEventBus.setData(getKeyValue("data", data));


                        EventBus.getDefault().post(baseEventBus);


                    }


@@ -182,7 +193,7 @@


                }




            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {


                WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());


                WifiUtils wifiUtils = WifiUtils.getInstance();


                //wifi模块


                switch (type) {


                    //获取wifi列表


@@ -309,9 +320,9 @@


                    break;


                }


            }


            HdlLogLogic.print("uni===原生接收uni发来的数据===大类->" + topic + "\r\n" + data, true);


            HdlLogLogic.print("uni发来的数据--->大类-->" + topic + "\r\n" + data, true);


        } catch (Exception e) {


            HdlLogLogic.print("uni===原生接收uni发来的数据===" + e.getMessage(), true);


            HdlLogLogic.print("uni发来的数据--->" + e.getMessage(), true);


        }




    }


@@ -326,7 +337,7 @@


    public void openUniMP(String path, JSONObject jsonObject) {


        JSONObject json = this.createdJSONObject(jsonObject, true);


        HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);


        HdlLogLogic.print("uni===组装uni发送数据格式===" + json, false);


        HdlLogLogic.print("uni--->组装uni发送数据格式--->" + json, false);


    }




    /**


@@ -512,6 +523,7 @@


            @Override


            public void onSuccess(Boolean b) {


                if (b) {


                    HdlLogLogic.print("本地升级--->", true);


                    //本地


                    //1,建立本地服务；


                    //2,告诉网关手机ip和端口；


@@ -528,7 +540,7 @@


                            }


                            String md5 = HDLMD5Utils.encodeMD5(data);//网关固件需要


                            //升级固件文件地址


                            String upgradeFileLocalPathUrl = "http://" + AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + firmwarePathFileName;


                            String upgradeFileLocalPathUrl = "http://" + NetworkUtils.getInstance().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + firmwarePathFileName;


                            //通知给网关升级固件文件地址等信息


                            HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, oid, module, version, data.length + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {


                                @Override


@@ -550,6 +562,7 @@


                        }


                    });


                } else {


                    HdlLogLogic.print("在线升级--->", true);


                    //远程升级需要检测在逆变器有没有连接上云


                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {


                        @Override


@@ -588,6 +601,7 @@




            @Override


            public void onFailure(HDLException e) {


                HdlLogLogic.print("在线升级--->", true);


                //远程升级需要检测在逆变器有没有连接上云


                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {


                    @Override


@@ -703,6 +717,7 @@


     * 向云端发起【设备驱动下载】指令


     */


    private void uniGatewayDriverDownload(Object data, DCUniMPJSCallback callback) {




        String deviceOid = getKeyValue("oid", getKeyValue("data", data));//逆变器设备oid


        String driverCode = getKeyValue("driverCode", getKeyValue("data", data));//驱动编码


        String imageId = getKeyValue("imageId", getKeyValue("data", data));//驱动镜像id


@@ -763,6 +778,7 @@


            @Override


            public void onSuccess(Boolean b) {


                if (b) {


                    HdlLogLogic.print("本地升级--->", true);


                    //本地


                    //1,建立本地服务；


                    // 2，告诉网关手机ip和端口；


@@ -779,7 +795,7 @@


                            }


                            String md5 = HDLMD5Utils.encodeMD5(data);//网关驱动需要


                            //升级驱动文件地址


                            String upgradeFileLocalPathUrl = "http://" + AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + drivePathFileName;


                            String upgradeFileLocalPathUrl = "http://" + NetworkUtils.getInstance().getIPAddress(HDLApp.getInstance()) + ":" + MyNanoHttpServer.HTTP_PORT + drivePathFileName;


                            //通知给网关升级驱动文件地址等信息


                            HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, deviceOid, module, version, data.length + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {


                                @Override


@@ -801,6 +817,7 @@


                        }


                    });


                } else {


                    HdlLogLogic.print("在线升级--->", true);


                    //远程升级需要【检测】在逆变器有没有连接上云


                    HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {


                        @Override


@@ -839,6 +856,7 @@




            @Override


            public void onFailure(HDLException e) {


                HdlLogLogic.print("在线升级--->", true);


                //远程升级需要【检测】在逆变器有没有连接上云


                HdlDeviceLogic.getInstance().checkInverterConnectedCloud(deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {


                    @Override


@@ -1143,7 +1161,7 @@


     * @param callback uni回调


     */


    private void uniGetCurrentHomeLocalAndCloudGatewayList(DCUniMPJSCallback callback) {


        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(new CloudCallBeak<List<GatewayBean>>() {


        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {


            @Override


            public void onSuccess(List<GatewayBean> list) {


                if (callback != null) {


@@ -1288,7 +1306,7 @@


     *


     * @return JSONObject


     */


    private JSONObject getJSONObject(Object obj) {


    public JSONObject getJSONObject(Object obj) {


        try {


            if (obj == null) {


                return new JSONObject();


@@ -1317,7 +1335,7 @@


     * @param obj -


     * @return value


     */


    private String getKeyValue(String key, Object obj) {


    public String getKeyValue(String key, Object obj) {


        try {


            JSONObject jsonObject = this.getJSONObject(obj);


            if (jsonObject.has(key)) {