Merge remote-tracking branch 'origin/wxr-app'

hxb

2022-11-24 0a7db7243a33a54d3733f60179185ee63599d397

 AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java

@@ -106,8 +106,30 @@
     */

    public static BindDeviceData.Response userDeviceBind(BindDeviceData bindDeviceData) throws BusinessException {

        HashMap<String, Object> paramsMap = new HashMap<String, Object>();

        paramsMap.put("token", bindDeviceData.data.token);

//        paramsMap.put("token", bindDeviceData.data.token);

//        paramsMap.put("deviceId", bindDeviceData.data.deviceId);

        paramsMap.put("code", bindDeviceData.data.code);

        paramsMap.put("spk","security.ipcam.imou");

        paramsMap.put("extDevId",bindDeviceData.data.deviceId);





        JsonObject json = HttpSend.execute(paramsMap, CONST.METHOD_BINDDEVICE,DMS_TIME_OUT);

        BindDeviceData.Response response = new BindDeviceData.Response();

        response.parseData(json);

        return response;

    }



    /**

     * 绑定设备

     *

     * @param bindDeviceData

     * @return

     * @throws BusinessException

     */

    public static BindDeviceData.Response hdlUserDeviceBind(BindDeviceData bindDeviceData) throws BusinessException {

        HashMap<String, Object> paramsMap = new HashMap<String, Object>();

        paramsMap.put("deviceId", bindDeviceData.data.deviceId);

        paramsMap.put("spk","security.ipcam.imou");

        paramsMap.put("code", bindDeviceData.data.code);

        JsonObject json = HttpSend.execute(paramsMap, CONST.METHOD_BINDDEVICE,DMS_TIME_OUT);

        BindDeviceData.Response response = new BindDeviceData.Response();