Merge branch '1.4.4' into dev

wjc

2 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

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

@@ -38,6 +38,7 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
@@ -395,6 +396,11 @@
                        this.uniGetGatewayInfo(mode_type, data, callback);
                    }
                    break;
                    //删除BMS/电池包
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_del_oid: {
                        this.uniDeleteOid(mode_type, data, callback);
                    }
                    break;
                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -709,7 +715,8 @@
                    //uni通知原生退出登录
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
                        HdlLogLogic.print("uni通知原生退出登录---", true);
                        HDLLinkPMUser.getInstance().logout(0);
//                        HDLLinkPMUser.getInstance().logout(0);
                        HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
                    }
                    break;
                    //本地密钥获取
@@ -770,10 +777,10 @@
                                            } else if (s.startsWith("[")) {
                                                uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
                                            } else {
                                                uniSuccessCallback(type, s, callback);
                                                uniSuccessCallback(type, new JsonArray(), callback);
                                            }
                                        } catch (Exception e) {
                                            uniSuccessCallback(type, s, callback);
                                            uniSuccessCallback(type, new JsonArray(), callback);
                                        }
                                    }
                                }
@@ -794,10 +801,10 @@
                                    } else if (json.startsWith("[")) {
                                        uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
                                    } else {
                                        uniSuccessCallback(type, json, callback);
                                        uniSuccessCallback(type, new JsonArray(), callback);
                                    }
                                } catch (Exception e) {
                                    uniSuccessCallback(type, json, callback);
                                    uniSuccessCallback(type, new JsonArray(), callback);
                                }
                                long endTime = System.currentTimeMillis() - startTime;
                                Log.d("====耗时时间====", String.valueOf(endTime));
@@ -817,6 +824,7 @@
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT: {
                        //退出无网模式标识
                        UserConfigManage.getInstance().setNoNetworkFlag(false);
                        UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(false);
                        UserConfigManage.getInstance().Save();
                        uniSuccessCallback(mode_type, true, callback);
                        if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
@@ -825,6 +833,12 @@
                        Intent intent = new Intent(HDLApp.getInstance(), LoginActivity.class);
                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                        HDLApp.getInstance().startActivity(intent);
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE: {
                        //设备离网时有入口进入无网模式
                        uniSuccessCallback(mode_type, true, callback);
                        HdlAccountLogic.getInstance().logout(LogoutType.UniLogout);
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO: {
@@ -2852,6 +2866,30 @@
        });
    }

    /**
     * 删除设备oid
     *
     * @param type     类型
     * @param data     uni请求数据
     * @param callback uni回调
     */
    public void uniDeleteOid(String type, Object data, DCUniMPJSCallback callback) {
        String mac = getKeyValue("mac", getKeyValue("data", data));
        String oid_json = getKeyValue("attribute_data", getKeyValue("data", data));
        JsonArray jsonArray = new Gson().fromJson(oid_json, JsonArray.class);
        HdlDeviceLogic.getInstance().deleteOid(mac, jsonArray, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onError(HDLLinkException e) {
                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
            }
        });
    }


    /**
     * 发送modbus协议数据