~wjc/HDLPhotovoltaicDebugAPP.git

parent: 89e0f6dd | 补丁 | 提交 | ignore whitespace

2024年06月17日19:27:09

mac

2024-06-17 e1e6413cdf1c490b0309611ef0ea2a3c4c54f7ec

2024年06月17日19:27:09

备份代码

4个文件已修改

	app/src/main/java/com/hdl/photovoltaic/other/HdlMemberLogic.java	93 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java	94 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java	96 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -261,69 +261,7 @@

    }

    /**
     * 获取电站交付二维码（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端）
@@ -461,38 +399,7 @@

    }

    /**
     * 电站授权安装商（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/HdlResidenceLogic.java

@@ -918,7 +918,101 @@
        });
    }

    /**
     * 电站授权安装商（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);
                }
            }
        });

    }
    /**
     * 获取电站交付二维码（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);
                }
            }
        });

    }
    /**
     * 添加推送Token
     *

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

@@ -199,6 +199,24 @@
                        EventBus.getDefault().post(baseEventBus);
                    }
                    break;
                    //电站的交付二维码(安装商)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
                        uniGetDeliveryUrlQrcode(type, data, callback);

                    }
                    break;
                    //电站手动交付(安装商)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
                        uniGetDeliverToAccount(type, data, callback);

                    }
                    break;
                    //电站授权安装商(C端)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM: {
                        uniHomeUpdateDebugPerm(type, data, callback);

                    }
                    break;

                }
                if (callback != null) {
@@ -627,6 +645,68 @@
    //region ******uni接口方法******

    /**
     * 电站授权安装商(C端)
     */
    private void uniHomeUpdateDebugPerm(String type, Object data, DCUniMPJSCallback callback) {


        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        boolean debugPerm = Boolean.parseBoolean(getKeyValue("debugPerm", getKeyValue("data", data)));
        HdlResidenceLogic.getInstance().homeUpdateDebugPerm(homeId, debugPerm, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onFailure(HDLException e) {
                uniExceptionCallback(type, e, callback);
            }
        });

    }

    /**
     * 电站手动交付(安装商)
     */
    private void uniGetDeliverToAccount(String type, Object data, DCUniMPJSCallback callback) {

        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        String account = getKeyValue("account", getKeyValue("data", data));
        HdlResidenceLogic.getInstance().getDeliverToAccount(homeId, account, new CloudCallBeak<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onFailure(HDLException e) {
                uniExceptionCallback(type, e, callback);
            }
        });

    }

    /**
     * 电站的交付二维码(安装商)
     */
    private void uniGetDeliveryUrlQrcode(String type, Object data, DCUniMPJSCallback callback) {
        String homeId = getKeyValue("homeId", getKeyValue("data", data));
        HdlResidenceLogic.getInstance().getDeliveryUrlQrcode(homeId, new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onFailure(HDLException e) {
                uniExceptionCallback(type, e, callback);
            }
        });

    }

    /**
     * 获取当前账号在公司的身份
     */
    private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {
@@ -648,7 +728,7 @@
     */
    private void uniGetStaffEdit(String type, Object data, DCUniMPJSCallback callback) {
        StaffBean staffBean = new StaffBean();
        String member_info = getKeyValue("staff_info", getKeyValue("data", data));
        String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                staffBean = new Gson().fromJson(member_info, StaffBean.class);
@@ -673,7 +753,7 @@
     */
    private void uniGetStaffDelete(String type, Object data, DCUniMPJSCallback callback) {
        StaffBean staffBean = new StaffBean();
        String member_info = getKeyValue("staff_info", getKeyValue("data", data));
        String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                staffBean = new Gson().fromJson(member_info, StaffBean.class);
@@ -698,7 +778,7 @@
     */
    private void uniGetStaffAdd(String type, Object data, DCUniMPJSCallback callback) {
        StaffBean staffBean = new StaffBean();
        String member_info = getKeyValue("staff_info", getKeyValue("data", data));
        String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                staffBean = new Gson().fromJson(member_info, StaffBean.class);
@@ -722,7 +802,9 @@
     * 获取员工列表
     */
    private void uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
        HdlMemberLogic.getInstance().getStaffList(1, 50, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
        long pageNo = Long.parseLong(getKeyValue("pageNo", getKeyValue("data", data)));
        long pageSize = Long.parseLong(getKeyValue("pageSize", getKeyValue("data", data)));
        HdlMemberLogic.getInstance().getStaffList(pageNo, pageSize, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
            @Override
            public void onSuccess(PageNumberObject<List<StaffBean>> obj) {
                uniSuccessCallback(type, obj.getList(), callback);
@@ -740,7 +822,7 @@
     */
    private void uniGetMemberEdit(String type, Object data, DCUniMPJSCallback callback) {
        MemberBean memberBean = new MemberBean();
        String member_info = getKeyValue("member_info", getKeyValue("data", data));
        String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                memberBean = new Gson().fromJson(member_info, MemberBean.class);
@@ -765,7 +847,7 @@
     */
    private void uniGetMemberDelete(String type, Object data, DCUniMPJSCallback callback) {
        MemberBean memberBean = new MemberBean();
        String member_info = getKeyValue("member_info", getKeyValue("data", data));
        String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                memberBean = new Gson().fromJson(member_info, MemberBean.class);
@@ -790,7 +872,7 @@
     */
    private void uniGetMemberAdd(String type, Object data, DCUniMPJSCallback callback) {
        MemberBean memberBean = new MemberBean();
        String member_info = getKeyValue("member_info", getKeyValue("data", data));
        String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
        if (!TextUtils.isEmpty(member_info)) {
            try {
                memberBean = new Gson().fromJson(member_info, MemberBean.class);

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

@@ -31,6 +31,9 @@
    public final static String UNI_EVENT_REPLY_HOME_EDIT = "edit";//住宅【电站】编辑
    public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//住宅【电站】详情
    public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//住宅【电站】删除
    public final static String UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE= "delivery_url_qrcode";//电站的交付二维码(安装商)
    public final static String UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT= "deliver_to_account";//电站手动交付(安装商)
    public final static String UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM= "update_debug_perm";//电站授权安装商(C端)

    public final static String UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE = "close_home_details_page";//关闭详情页
    /*********设备模块*********/

			@@ -261,69 +261,7 @@

			}

			/**
			* 获取电站交付二维码（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端）
			@@ -461,38 +399,7 @@

			}

			/**
			* 电站授权安装商（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);
			}
			}
			});

			}


			}

			@@ -918,7 +918,101 @@
			});
			}

			/**
			* 电站授权安装商（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);
			}
			}
			});

			}
			/**
			* 获取电站交付二维码（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);
			}
			}
			});

			}
			/**
			* 添加推送Token
			*

			@@ -199,6 +199,24 @@
			EventBus.getDefault().post(baseEventBus);
			}
			break;
			//电站的交付二维码(安装商)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
			uniGetDeliveryUrlQrcode(type, data, callback);

			}
			break;
			//电站手动交付(安装商)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
			uniGetDeliverToAccount(type, data, callback);

			}
			break;
			//电站授权安装商(C端)
			case HDLUniMP.UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM: {
			uniHomeUpdateDebugPerm(type, data, callback);

			}
			break;

			}
			if (callback != null) {
			@@ -627,6 +645,68 @@
			//region ****uni接口方法****

			/**
			* 电站授权安装商(C端)
			*/
			private void uniHomeUpdateDebugPerm(String type, Object data, DCUniMPJSCallback callback) {


			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			boolean debugPerm = Boolean.parseBoolean(getKeyValue("debugPerm", getKeyValue("data", data)));
			HdlResidenceLogic.getInstance().homeUpdateDebugPerm(homeId, debugPerm, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			public void onFailure(HDLException e) {
			uniExceptionCallback(type, e, callback);
			}
			});

			}

			/**
			* 电站手动交付(安装商)
			*/
			private void uniGetDeliverToAccount(String type, Object data, DCUniMPJSCallback callback) {

			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			String account = getKeyValue("account", getKeyValue("data", data));
			HdlResidenceLogic.getInstance().getDeliverToAccount(homeId, account, new CloudCallBeak<Boolean>() {
			@Override
			public void onSuccess(Boolean obj) {
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			public void onFailure(HDLException e) {
			uniExceptionCallback(type, e, callback);
			}
			});

			}

			/**
			* 电站的交付二维码(安装商)
			*/
			private void uniGetDeliveryUrlQrcode(String type, Object data, DCUniMPJSCallback callback) {
			String homeId = getKeyValue("homeId", getKeyValue("data", data));
			HdlResidenceLogic.getInstance().getDeliveryUrlQrcode(homeId, new CloudCallBeak<String>() {
			@Override
			public void onSuccess(String obj) {
			uniSuccessCallback(type, obj, callback);
			}

			@Override
			public void onFailure(HDLException e) {
			uniExceptionCallback(type, e, callback);
			}
			});

			}

			/**
			* 获取当前账号在公司的身份
			*/
			private void uniGetUserRightType(String type, Object data, DCUniMPJSCallback callback) {
			@@ -648,7 +728,7 @@
			*/
			private void uniGetStaffEdit(String type, Object data, DCUniMPJSCallback callback) {
			StaffBean staffBean = new StaffBean();
			String member_info = getKeyValue("staff_info", getKeyValue("data", data));
			String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(member_info)) {
			try {
			staffBean = new Gson().fromJson(member_info, StaffBean.class);
			@@ -673,7 +753,7 @@
			*/
			private void uniGetStaffDelete(String type, Object data, DCUniMPJSCallback callback) {
			StaffBean staffBean = new StaffBean();
			String member_info = getKeyValue("staff_info", getKeyValue("data", data));
			String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(member_info)) {
			try {
			staffBean = new Gson().fromJson(member_info, StaffBean.class);
			@@ -698,7 +778,7 @@
			*/
			private void uniGetStaffAdd(String type, Object data, DCUniMPJSCallback callback) {
			StaffBean staffBean = new StaffBean();
			String member_info = getKeyValue("staff_info", getKeyValue("data", data));
			String member_info = getKeyValue("staffInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(member_info)) {
			try {
			staffBean = new Gson().fromJson(member_info, StaffBean.class);
			@@ -722,7 +802,9 @@
			* 获取员工列表
			*/
			private void uniGetStaffList(String type, Object data, DCUniMPJSCallback callback) {
			HdlMemberLogic.getInstance().getStaffList(1, 50, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
			long pageNo = Long.parseLong(getKeyValue("pageNo", getKeyValue("data", data)));
			long pageSize = Long.parseLong(getKeyValue("pageSize", getKeyValue("data", data)));
			HdlMemberLogic.getInstance().getStaffList(pageNo, pageSize, new CloudCallBeak<PageNumberObject<List<StaffBean>>>() {
			@Override
			public void onSuccess(PageNumberObject<List<StaffBean>> obj) {
			uniSuccessCallback(type, obj.getList(), callback);
			@@ -740,7 +822,7 @@
			*/
			private void uniGetMemberEdit(String type, Object data, DCUniMPJSCallback callback) {
			MemberBean memberBean = new MemberBean();
			String member_info = getKeyValue("member_info", getKeyValue("data", data));
			String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(member_info)) {
			try {
			memberBean = new Gson().fromJson(member_info, MemberBean.class);
			@@ -765,7 +847,7 @@
			*/
			private void uniGetMemberDelete(String type, Object data, DCUniMPJSCallback callback) {
			MemberBean memberBean = new MemberBean();
			String member_info = getKeyValue("member_info", getKeyValue("data", data));
			String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(member_info)) {
			try {
			memberBean = new Gson().fromJson(member_info, MemberBean.class);
			@@ -790,7 +872,7 @@
			*/
			private void uniGetMemberAdd(String type, Object data, DCUniMPJSCallback callback) {
			MemberBean memberBean = new MemberBean();
			String member_info = getKeyValue("member_info", getKeyValue("data", data));
			String member_info = getKeyValue("memberInfo", getKeyValue("data", data));
			if (!TextUtils.isEmpty(member_info)) {
			try {
			memberBean = new Gson().fromJson(member_info, MemberBean.class);

			@@ -31,6 +31,9 @@
			public final static String UNI_EVENT_REPLY_HOME_EDIT = "edit";//住宅【电站】编辑
			public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//住宅【电站】详情
			public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//住宅【电站】删除
			public final static String UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE= "delivery_url_qrcode";//电站的交付二维码(安装商)
			public final static String UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT= "deliver_to_account";//电站手动交付(安装商)
			public final static String UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM= "update_debug_perm";//电站授权安装商(C端)

			public final static String UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE = "close_home_details_page";//关闭详情页
			/*******设备模块*******/