From 0a7db7243a33a54d3733f60179185ee63599d397 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 24 十一月 2022 12:47:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr-app'
---
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
index 5c66232..8f7bb31 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java
@@ -3,6 +3,7 @@
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
import com.mm.android.deviceaddmodule.LCDeviceEngine;
import com.mm.android.deviceaddmodule.device_wifi.CurWifiInfo;
import com.mm.android.deviceaddmodule.device_wifi.WifiConfig;
@@ -19,6 +20,7 @@
import org.json.JSONObject;
import java.util.HashMap;
+import java.util.Map;
public class DeviceAddOpenApiManager {
private static int TIME_OUT = 10 * 1000;
@@ -104,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();
@@ -241,9 +265,15 @@
return json.get("openid").getAsString();
}
- public static boolean addPolicy(AddDevicePolicyData req)throws BusinessException{
- String jsonParam = new Gson().toJson(req);
- HttpSend.execute(jsonParam, CONST.ADD_POLICY,TIME_OUT);
- return true;
+ public static boolean addPolicy(AddDevicePolicyData req)throws BusinessException {
+// String jsonParam = new Gson().toJson(req);
+// HttpSend.execute(jsonParam, CONST.ADD_POLICY,TIME_OUT);
+// return true;
+
+ final Map<String, Object> map = new Gson().fromJson(new Gson().toJson(req), new TypeToken<Map<String, String>>() {
+ }.getType());
+
+ JsonObject json = HttpSend.execute(map, CONST.CREATE_SUB_ACCOUNT, TIME_OUT);
+ return true;
}
}
--
Gitblit v1.8.0