2024年06月12日14:53:31

mac

2024-06-12 d8d41b0623146ec890ec9191b613c0e8f13197dd

2024年06月12日14:53:31

备份代码

 app/src/main/java/com/hdl/photovoltaic/enums/ChildAccountType.java

New file
@@ -0,0 +1,11 @@
package com.hdl.photovoltaic.enums;

/**
 * 子账户类型
 */
public @interface ChildAccountType {
    String ORDINARY = "ORDINARY";//普通成员
    String DEBUG = "DEBUG";//调试人员
    String ADMIN = "ADMIN";//管理员
    String VIEW = "VIEW";//仅查看
}

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

@@ -55,16 +55,17 @@
    public static final String POST_Device_Add = "/home-wisdom/program/device/independentRegister";
    //批量添加逆变器
    public static final String POST_Device_Add_All = "/home-wisdom/program/device/batchIndependentRegister";
    //获取逆变器列表
    //获取(云端)逆变器列表
    public static final String POST_Device_List = "/home-wisdom/app/device/inverter/list";
    //删除逆变器
    public static final String POST_Device_Remove = "/home-wisdom/app/device/remove";
    //删删除逆变器及下挂设备
    public static final String POST_Device_Remove = "/home-wisdom/app/powerStation/device/delete";
    //获取下挂设备列表
    public static final String POST_Device_ChildDevices_List = "/home-wisdom/app/powerStation/childDevices";
    //全量更新OID
    public static final String POST_Device_Oid = "/home-wisdom/program/device/oid/add";
    //设备基本信息(oid)增量添加
    public static final String POST_Device_IncrAdd = "/home-wisdom/program/device/oid/incrAdd";
    public static final String POST_Device_Rename = "/home-wisdom/app/powerStation/device/rename";
    //获取逆变器(获取设备远程通讯信息)
    public static final String POST_Device_RemoteInfo = "/home-wisdom/program/device/remoteInfo";
    //设备基本信息列表(oid)获取
@@ -121,6 +122,18 @@
    public static final String B_POST_GET_USERINFO = "/basis-footstone/mgmt/user/oauth/getUserInfo";
    //联系我们
    public static final String B_POST_GET_UTIL_CONTACT = "/home-wisdom/app/powerStation/util/contact";
    //获取当前账号在公司的身份
    public static final String B_POST_GET_USERRIGHTTYPE = "/home-wisdom/app/powerStation/user/manage/userRightType";
    //获取员工列表
    public static final String B_POST_GET_LISTBYPAGE = "/home-wisdom/app/powerStation/user/manage/listByPage";
    //获取员工详情
    public static final String B_POST_GET_MANAGE_INFO = "/home-wisdom/app/powerStation/user/manage/info";
    //员工添加（B端）
    public static final String B_POST_GET_MANAGE_CREATE = "/home-wisdom/app/powerStation/user/manage/create";
    //员工编辑（B端）
    public static final String B_POST_GET_MANAGE_EDIT = "/home-wisdom/app/powerStation/user/manage/edit";
    //员工删除（B端）
    public static final String B_POST_GET_MANAGE_DELETE = "/home-wisdom/app/powerStation/user/manage/delete";


    //退出登录
@@ -130,8 +143,11 @@
    public static final String POST_deviceList = "/home-wisdom/app/powerStation/deviceList";
    //电站状态概览(安装商)
    public static final String POST_statusOverview = "/home-wisdom/app/powerStation/statusOverview";
    //获取电站交付二维码(安装商)
    public static final String POST_getDeliveryUrlQrcode = "/home-wisdom/app/powerStation/getDeliveryUrlQrcode";


    //电站手动交付(安装商)
    public static final String POST_deliverToAccount = "/home-wisdom/app/powerStation/deliverToAccount";
    //endregion


@@ -159,6 +175,16 @@
    public static final String C_POST_MEMBERINFO_BINDWITHACCOUNT = "/smart-footstone/member/memberInfo/bindWithAccount";
    //解绑认证(手机/邮箱)
    public static final String C_POST_MEMBERINFO_UNBINDWITHACCOUNT = "/smart-footstone/member/memberInfo/unbindWithAccount";
    //成员列表
    public static final String C_POST_MEMBER_LIST = "/home-wisdom/app/child/account/findAll";
    //添加成员
    public static final String C_POST_MEMBER_ADD = "/home-wisdom/app/child/account/add";
    //编辑成员
    public static final String C_POST_MEMBER_EDIT = "/home-wisdom/app/child/account/update";
    //删除成员
    public static final String C_POST_MEMBER_DELETE = "/home-wisdom/app/child/account/delete";
    //电站授权安装商
    public static final String C_POST_HOME_UPDATEDEBUGPERM = "/home-wisdom/app/home/updateDebugPerm";


    //endregion

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

@@ -159,6 +159,28 @@
    }

    /**
     * 添加【设备列表】到本地缓存
     *
     * @param list -设备列表
     */
    public void setListDevice(List<CloudInverterDeviceBean> list) {
        try {
            if (list == null || list.size() == 0) {
                return;
            }
            if (this.mListDevice.size() == 0) {
                this.mListDevice.addAll(list);
                return;
            }
            for (int i = 0; i < list.size(); i++) {
                this.setSingleDevice(list.get(i));
            }
        } catch (Exception ignored) {
        }
    }


    /**
     * 获取设备列表(安装商)
     *
     * @param searchTxt 搜索内容
@@ -198,28 +220,6 @@
                }
            }
        });
    }


    /**
     * 添加【设备列表】到本地缓存
     *
     * @param list -设备列表
     */
    public void setListDevice(List<CloudInverterDeviceBean> list) {
        try {
            if (list == null || list.size() == 0) {
                return;
            }
            if (this.mListDevice.size() == 0) {
                this.mListDevice.addAll(list);
                return;
            }
            for (int i = 0; i < list.size(); i++) {
                this.setSingleDevice(list.get(i));
            }
        } catch (Exception ignored) {
        }
    }

    /**
@@ -709,6 +709,42 @@

    }

    /**
     * 修改设备名称逆变器BMS电池包
     * 描述:  修改设备名称，支持逆变器，BMS，电池包设备名称修改
     *
     * @param homeId        住宅id
     * @param deviceType    设备类型(INV:逆变器,BMS:BMS控制盒,BATTERY:电池单元)
     * @param deviceId      设备id(deviceType = INV 是逆变器deviceId;deviceType = BMS 是BMS的deviceOidId;deviceType = BATTERY 是电池包的deviceOidId)
     * @param cloudCallBeak 回调update
     */
    public void setRename(String homeId, String deviceType, String deviceId, String name, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Device_Rename;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
        json.addProperty("name", name);
        json.addProperty("deviceType", deviceType);//设备类型(INV:逆变器,BMS:BMS控制盒,BATTERY:电池单元)
        json.addProperty("deviceId", deviceId);//设备id(deviceType = INV 是逆变器deviceId;deviceType = BMS 是BMS的deviceOidId;deviceType = BATTERY 是电池包的deviceOidId)
        // json.addProperty("zoneType", "password");//区域
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String str) {

                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(true);
                }
            }

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

    }


    /**
     * 设置网关远程参数
@@ -999,7 +1035,7 @@
     * @param cloudCallBeak 返回逆变器列表
     */
    public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(homeId,new GatewayCallBack() {
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(homeId, new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                //局域网有2种情况(1:有局域网，有外网；2:有局域网，没有外网);
@@ -1201,7 +1237,7 @@
     *
     * @param gatewayCallBack -
     */
    public void searchCurrentHomeGateway(String homeId,GatewayCallBack gatewayCallBack) {
    public void searchCurrentHomeGateway(String homeId, GatewayCallBack gatewayCallBack) {
        List<String> spks = this.getGatewaySpk();
        //网关搜索
        HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(homeId, spks, true, gatewayCallBack);
@@ -1225,8 +1261,8 @@
     * @param deviceMac 设备mac，
     * @param callBeak  返回 true=本地连接;false=远程;
     */
    public void isLocalConnect(String homeId,String deviceMac, CloudCallBeak<Boolean> callBeak) {
        searchCurrentHomeGateway(homeId,new GatewayCallBack() {
    public void isLocalConnect(String homeId, String deviceMac, CloudCallBeak<Boolean> callBeak) {
        searchCurrentHomeGateway(homeId, new GatewayCallBack() {
            @Override
            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                if (gatewayBeanList == null || gatewayBeanList.size() == 0) {

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

@@ -6,18 +6,16 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;

import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;

/**
@@ -44,14 +42,49 @@
    }

    /**
     * 获取员工列表
     * 获取当前账号在公司的身份
     *
     * @param cloudCallBeak -
     */
    public void getUserRightType(CloudCallBeak<PageNumberObject<UserRightTypeBean>> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_GET_USERRIGHTTYPE;
        JsonObject json = new JsonObject();
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (TextUtils.isEmpty(jsonStr)) {
                    if (cloudCallBeak != null) {
                        cloudCallBeak.onSuccess(new PageNumberObject<>());
                    }
                }
                Gson gson = new Gson();
                Type type = new TypeToken<PageNumberObject<UserRightTypeBean>>() {
                }.getType();
                PageNumberObject<UserRightTypeBean> pageNumberObject = gson.fromJson(jsonStr, type);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(pageNumberObject);
                }
            }

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

    }

    /**
     * 获取员工列表（B端）
     *
     * @param pageNo        页码
     * @param pageSize      页数（一页多少数据）
     * @param cloudCallBeak -
     */
    public void getStaffList(long pageNo, long pageSize, CloudCallBeak<PageNumberObject<List<StaffBean>>> cloudCallBeak) {
        String requestUrl = "/home-wisdom/app/powerStation/user/manage/listByPage";// HttpApi.POST_PowerStation_List;
        String requestUrl = HttpApi.B_POST_GET_LISTBYPAGE;
        JsonObject json = new JsonObject();
        json.addProperty("pageNo", pageNo);
        json.addProperty("pageSize", pageNo);
@@ -83,13 +116,13 @@
    }

    /**
     * 获取员工详情
     * 获取员工详情（B端）
     *
     * @param userId        -
     * @param cloudCallBeak -
     */
    public void getStaffInfo(String userId, CloudCallBeak<PageNumberObject<StaffBean>> cloudCallBeak) {
        String requestUrl = "/home-wisdom/app/powerStation/user/manage/info";// HttpApi.POST_PowerStation_List;
        String requestUrl = HttpApi.B_POST_GET_MANAGE_INFO;
        JsonObject json = new JsonObject();
        json.addProperty("userId", userId);
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -120,13 +153,13 @@
    }

    /**
     * 员工添加
     * 员工添加（B端）
     *
     * @param staffBean     员工对象
     * @param cloudCallBeak -
     */
    public void getStaffAdd(StaffBean staffBean, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = "/home-wisdom/app/powerStation/user/manage/create";// HttpApi.POST_PowerStation_List;
        String requestUrl = HttpApi.B_POST_GET_MANAGE_CREATE;
        JsonObject json = new JsonObject();
        if (!TextUtils.isEmpty(staffBean.getUserName())) {
            json.addProperty("userName", staffBean.getUserName());
@@ -159,13 +192,13 @@
    }

    /**
     * 员工编辑
     * 员工编辑（B端）
     *
     * @param staffBean     员工对象
     * @param cloudCallBeak -
     */
    public void getStaffEdit(StaffBean staffBean, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = "/home-wisdom/app/powerStation/user/manage/edit";// HttpApi.POST_PowerStation_List;
        String requestUrl = HttpApi.B_POST_GET_MANAGE_EDIT;
        JsonObject json = new JsonObject();
        if (!TextUtils.isEmpty(staffBean.getUserId())) {
            json.addProperty("userId", staffBean.getUserId());
@@ -201,13 +234,13 @@
    }

    /**
     * 员工删除
     * 员工删除（B端）
     *
     * @param staffBean     员工对象
     * @param cloudCallBeak -
     */
    public void getStaffDelete(StaffBean staffBean, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = "/home-wisdom/app/powerStation/user/manage/delete";// HttpApi.POST_PowerStation_List;
        String requestUrl = HttpApi.B_POST_GET_MANAGE_DELETE;
        JsonObject json = new JsonObject();
        json.addProperty("userId", staffBean.getUserId());

@@ -228,4 +261,239 @@
        });

    }

    /**
     * 获取电站交付二维码（B端）
     * 描述：安装商电站的交付二维码
     *
     * @param homeId        电站id
     * @param cloudCallBeak -
     */
    public void getDeliveryUrlQrcode(String homeId, CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.POST_getDeliveryUrlQrcode;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
//        json.addProperty("zoneType", memberBean.getId());//区域

        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);
                }
            }
        });

    }

    /**
     * 电站手动交付(B端)
     * 描述：安装商手动交付电站给指定的C端账号
     *
     * @param homeId        电站id
     * @param account       C端账号
     * @param cloudCallBeak -
     */
    public void getDeliverToAccount(String homeId, String account, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_deliverToAccount;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
        json.addProperty("account", account);//C端账号
//        json.addProperty("zoneType", memberBean.getId());//区域

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

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

    }

    /**
     * 获取成员列表（C端）
     *
     * @param memberBean    成员对象
     * @param cloudCallBeak -
     */
    public void getMemberList(MemberBean memberBean, CloudCallBeak<List<MemberBean>> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_MEMBER_LIST;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", memberBean.getHomeId());

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (TextUtils.isEmpty(jsonStr)) {
                    if (cloudCallBeak != null) {
                        cloudCallBeak.onSuccess(new ArrayList<>());
                    }
                }
                Gson gson = new Gson();
                Type type = new TypeToken<List<MemberBean>>() {
                }.getType();
                List<MemberBean> memberBeanList = gson.fromJson(jsonStr, type);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(memberBeanList);
                }
            }

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

    }

    /**
     * 添加成员（C端）
     *
     * @param memberBean    成员对象
     * @param cloudCallBeak -
     */
    public void getMemberAdd(MemberBean memberBean, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_MEMBER_ADD;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", memberBean.getHomeId());
        json.addProperty("account", memberBean.getAccount());
        json.addProperty("childAccountType", memberBean.getChildAccountType());////子账户类型(ORDINARY ：普通成员,DEBUG ： 调试人员,ADMIN ： 管理员,VIEW : 仅查看)
        json.addProperty("nickName", memberBean.getNickName());

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

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

    }

    /**
     * 编辑成员（C端）
     *
     * @param memberBean    成员对象
     * @param cloudCallBeak -
     */
    public void getMemberEdit(MemberBean memberBean, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_MEMBER_EDIT;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", memberBean.getHomeId());
        json.addProperty("childAccountId", memberBean.getChildAccountId());
        json.addProperty("childId", memberBean.getId());//查找子账号接口获取到的数据（主键id==childId）
        json.addProperty("childAccountType", memberBean.getChildAccountType());////子账户类型(ORDINARY ：普通成员,DEBUG ： 调试人员,ADMIN ： 管理员,VIEW : 仅查看)
        json.addProperty("nickName", memberBean.getNickName());
//        json.addProperty("isRemoteControl", memberBean.getNickName());//远程控制
//        json.addProperty("isAllowCreateScene", memberBean.getNickName());//创建场景

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

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

    }

    /**
     * 删除成员（C端）
     *
     * @param memberBean    成员对象
     * @param cloudCallBeak -
     */
    public void getMemberDelete(MemberBean memberBean, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_MEMBER_DELETE;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", memberBean.getHomeId());
        json.addProperty("childAccountId", memberBean.getChildAccountId());
        json.addProperty("childId", memberBean.getId());//查找子账号接口获取到的数据（主键id==childId）

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

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

    }

    /**
     * 电站授权安装商（C端）
     * 描述：交付后的住宅，C端用户可以开启授权后安装商可以继续调试电站
     *
     * @param homeId        电站id
     * @param debugPerm     授权状态（true可以继续调试）
     * @param cloudCallBeak -
     */
    public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_HOME_UPDATEDEBUGPERM;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
        json.addProperty("debugPerm", debugPerm);
//        json.addProperty("zoneType", memberBean.getId());//区域

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

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

    }


}

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

@@ -282,7 +282,11 @@
                        this.setInverterDeviceRemoteInfo(mode_type, data, callback);
                    }
                    break;

                    //设备名称修改(修改是云端oid名称，设备使用modbus协议修改)
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_EDIT_NAME: {
                        this.uniOidEditName(mode_type, data, callback);
                    }
                    break;
                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -462,6 +466,11 @@
                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                        intent.setClass(HDLApp.getInstance(), SetActivity.class);
                        HDLApp.getInstance().startActivity(intent);

                    }
                    break;
                    //成员列表
                    case HDLUniMP.UNI_EVENT_REPLY_MEMBER_LIST: {

                    }
                    break;
@@ -802,7 +811,7 @@
        String module = "FW#" + imageId;//模块信息(HW：硬件)

        //升级本地优先->云端升级
        HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() {
        HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
@@ -1054,7 +1063,7 @@
        String imageId = getKeyValue("imageId", getKeyValue("data", data));//固件镜像id
        String module = driverCode + "#" + imageId;
        //升级本地优先->云端升级
        HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() {
        HdlDeviceLogic.getInstance().isLocalConnect(homeId, deviceMac, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean b) {
                if (b) {
@@ -1568,7 +1577,10 @@
     */
    private void uniDelInverterDevice(String type, Object data, DCUniMPJSCallback callback) {
        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
        String homeId = UserConfigManage.getInstance().getHomeId();
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        if (TextUtils.isEmpty(homeId)) {
            homeId = UserConfigManage.getInstance().getHomeId();
        }
        HdlDeviceLogic.getInstance().delInverterDevice(homeId, deviceId, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
@@ -1863,6 +1875,31 @@
        });
    }

    /**
     * 修改设备名称逆变器BMS电池包
     *
     * @param type     账号
     * @param data     uni请求数据
     * @param callback uni回调
     */
    public void uniOidEditName(String type, Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        String deviceType = getKeyValue("deviceType", getKeyValue("data", data));
        String deviceId = getKeyValue("deviceId", getKeyValue("data", data));
        String name = getKeyValue("name", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().setRename(homeId, deviceType, deviceId, name, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniCallbackData(type, obj, callback);
            }

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


    /**
     * 发送modbus协议数据

 app/src/main/java/com/hdl/photovoltaic/ui/bean/MemberBean.java

New file
@@ -0,0 +1,177 @@
package com.hdl.photovoltaic.ui.bean;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

/**
 * 成员的实体
 */
public class MemberBean implements Serializable {

    private String id;//主键
    private String account;//子用户 phone 或者 email
    private String childAccountType;//子账户类型(ORDINARY ：普通成员,DEBUG ： 调试人员,ADMIN ： 管理员,VIEW : 仅查看)

    private String childAccountId;//子账号id
    private String childAccountRegionId;//子账号区域id
    private String homeId;//电站id
    private String homeRegionId;//住宅区域id
    private boolean isRemoteControl;//远程控制 (默认true)
    private String nickName;//子账号昵称
    private String faceUrl;//成员人脸图片,图片url或者图片,base64传图片base64时固定传jpg格式的图片

    private String createPeople;//    创建人ID
    private boolean isAllowCreateScene;//创建场景
    private String modifyPeople;//最后修改人ID
    private String modifyTime;//最后修改时间
    private String region;//服务区域

    private int isDelete;//isDelete    0:未删除 1:删除

    private List<String> privileges = new ArrayList<>();//权限

    public int getIsDelete() {
        return isDelete;
    }

    public void setIsDelete(int isDelete) {
        this.isDelete = isDelete;
    }

    public List<String> getPrivileges() {
        return privileges;
    }

    public void setPrivileges(List<String> privileges) {
        this.privileges = privileges;
    }

    public String getId() {
        return id == null ? "" : id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getChildAccountId() {
        return childAccountId == null ? "" : childAccountId;
    }

    public void setChildAccountId(String childAccountId) {
        this.childAccountId = childAccountId;
    }

    public String getChildAccountRegionId() {
        return childAccountRegionId == null ? "" : childAccountRegionId;
    }

    public void setChildAccountRegionId(String childAccountRegionId) {
        this.childAccountRegionId = childAccountRegionId;
    }

    public String getHomeRegionId() {
        return homeRegionId == null ? "" : homeRegionId;
    }

    public void setHomeRegionId(String homeRegionId) {
        this.homeRegionId = homeRegionId;
    }

    public boolean isRemoteControl() {
        return isRemoteControl;
    }

    public void setRemoteControl(boolean remoteControl) {
        isRemoteControl = remoteControl;
    }

    public String getFaceUrl() {
        return faceUrl == null ? "" : faceUrl;
    }

    public void setFaceUrl(String faceUrl) {
        this.faceUrl = faceUrl;
    }

    public String getCreatePeople() {
        return createPeople == null ? "" : createPeople;
    }

    public void setCreatePeople(String createPeople) {
        this.createPeople = createPeople;
    }

    public boolean isAllowCreateScene() {
        return isAllowCreateScene;
    }

    public void setAllowCreateScene(boolean allowCreateScene) {
        isAllowCreateScene = allowCreateScene;
    }

    public String getModifyPeople() {
        return modifyPeople == null ? "" : modifyPeople;
    }

    public void setModifyPeople(String modifyPeople) {
        this.modifyPeople = modifyPeople;
    }

    public String getModifyTime() {
        return modifyTime == null ? "" : modifyTime;
    }

    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }

    public String getRegion() {
        return region == null ? "" : region;
    }

    public void setRegion(String region) {
        this.region = region;
    }

    public String getAccount() {
        return account == null ? "" : account;
    }

    public void setAccount(String account) {
        this.account = account;
    }

    public String getChildAccountType() {
        return childAccountType == null ? "" : childAccountType;
    }

    public void setChildAccountType(String childAccountType) {
        this.childAccountType = childAccountType;
    }

    public String getHomeId() {
        return homeId == null ? "" : homeId;
    }

    public void setHomeId(String homeId) {
        this.homeId = homeId;
    }

    public boolean isIsRemoteControl() {
        return isRemoteControl;
    }

    public void setIsRemoteControl(boolean isRemoteControl) {
        this.isRemoteControl = isRemoteControl;
    }

    public String getNickName() {
        return nickName == null ? "" : nickName;
    }

    public void setNickName(String nickName) {
        this.nickName = nickName;
    }
}

 app/src/main/java/com/hdl/photovoltaic/ui/bean/QrCodeBean.java

New file
@@ -0,0 +1,46 @@
package com.hdl.photovoltaic.ui.bean;

import java.io.Serializable;

/**
 * 二维码名片
 */
public class QrCodeBean implements Serializable {
    private String userName;//户名称
    private String sex;//性别(男，女)
    private String userPhone;//手机号
    private String userEmail;//、邮箱

    public String getUserName() {

        return userName == null ? "" : userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    public String getSex() {
        return sex == null ? "" : sex;
    }

    public void setSex(String sex) {
        this.sex = sex;
    }

    public String getUserPhone() {
        return userPhone == null ? "" : userPhone;
    }

    public void setUserPhone(String userPhone) {
        this.userPhone = userPhone;
    }

    public String getUserEmail() {
        return userEmail == null ? "" : userEmail;
    }

    public void setUserEmail(String userEmail) {
        this.userEmail = userEmail;
    }
}

 app/src/main/java/com/hdl/photovoltaic/ui/bean/UserRightTypeBean.java

New file
@@ -0,0 +1,15 @@
package com.hdl.photovoltaic.ui.bean;

import java.io.Serializable;

public class UserRightTypeBean implements Serializable {
    private String userRightType;//权限类型(MANAGER:公司管理员;USER：普通员工)

    public String getUserRightType() {
        return userRightType == null ? "" : userRightType;
    }

    public void setUserRightType(String userRightType) {
        this.userRightType = userRightType;
    }
}

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

@@ -51,8 +51,9 @@
    public final static String UNI_EVENT_REPLY_DEVICE_Link_read_SEND = "link_property_read";//link协议属性读取
    public final static String UNI_EVENT_REPLY_DEVICE_MESSAGE_NUMBER = "message_number";//消息总数量
    public final static String UNI_EVENT_REPLY_DEVICE_DELETE_OID = "delete_Oid";//删除设备oid
    public final static String UNI_EVENT_REPLY_DEVICE_INITIALIZEINVERTER = "initializeInverter";//重置逆变器
    public final static String UNI_EVENT_REPLY_DEVICE_REMOTEINFO = "set_device_remoteInfo";//设置设备远程信息
    public final static String UNI_EVENT_REPLY_DEVICE_INITIALIZEINVERTER = "initializeInverter";//初始化逆变器
    public final static String UNI_EVENT_REPLY_DEVICE_REMOTEINFO = "set_device_remoteInfo";//设置设备远程信息edit_name
    public final static String UNI_EVENT_REPLY_DEVICE_EDIT_NAME = "edit_name";//设备名称修改(修改是云端oid名称，设备使用modbus协议修改)


    /*********OTA模块*********/
@@ -84,7 +85,7 @@
    public final static String UNI_EVENT_REPLY_OTHER_LOGOUT = "uni_logout";//退出登录


    /*********C端【我的】模块*********/
    /*********【我的】模块*********/
    public final static String UNI_EVENT_REPLY_MINE_MODEL = "uni_mine_model";//我的模块(大类)
    public final static String UNI_EVENT_REPLY_MINE_USER_INFO = "get_user_info";//个人信息获取：
    public final static String UNI_EVENT_REPLY_MINE_EDIT_AVATAR = "edit_avatar";//头像更新
@@ -94,6 +95,14 @@
    public final static String UNI_EVENT_REPLY_MINE_USER_MANAGER = "user_manager";//用户管理
    public final static String UNI_EVENT_REPLY_MINE_ABOUT = "about";//关于
    public final static String UNI_EVENT_REPLY_MINE_SETTING = "setting";//设置
    public final static String UNI_EVENT_REPLY_MEMBER_LIST = "member_list";//成员列表
    public final static String UNI_EVENT_REPLY_MEMBER_ADD = "member_add";//成员添加
    public final static String UNI_EVENT_REPLY_MEMBER_DELETE = "member_delete";//成员删除
    public final static String UNI_EVENT_REPLY_MEMBER_EDIT = "member_edit";//成员编辑（包含备注、权限修改）
    public final static String UNI_EVENT_REPLY_STAFF_LIST = "staff_list";//员工列表
    public final static String UNI_EVENT_REPLY_STAFF_ADD = "staff_add";//员工添加
    public final static String UNI_EVENT_REPLY_STAFF_DELETE = "staff_delete";//员工删除
    public final static String UNI_EVENT_REPLY_STAFF_EDIT = "staff_edit";//员工编辑


    /*********Wifi模块*********/
@@ -108,6 +117,7 @@
    public final static String UNI_EVENT_REPLY_DEVICE_ETHERNET_SET = "device_ethernet_set";//逆变器以太网配置
    public final static String UNI_EVENT_REPLY_DEVICE_ETHERNET_GET = "device_ethernet_get";//逆变器以太网获取


    //endregion

    //region --------【原生】主动发送到【小程序】--------

 app/src/main/res/values/strings.xml

@@ -246,6 +246,8 @@
    <string name="restarting_please_wait">重启中,请等待…</string>
    <string name="port_conflict">应用冲突，需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试</string>



    <string name="cancel_download_successfully">取消下载成功.</string>
    <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功.</string>
    <string name="download_firmware_upgrade_file_failed">下载固件升级文件失败.</string>