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/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java b/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java index 0dc7d6d..3283b52 100644 --- a/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java +++ b/AndroidOpenDemo/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java @@ -14,11 +14,7 @@ import com.google.gson.JsonObject; import com.mm.android.deviceaddmodule.LCDeviceEngine; import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.BusinessException; -import com.mm.android.deviceaddmodule.mobilecommon.common.Constants; -import com.mm.android.deviceaddmodule.mobilecommon.utils.PreferencesHelper; import com.mm.android.deviceaddmodule.openapi.HttpSend; - -import org.json.JSONObject; import java.util.HashMap; @@ -124,6 +120,14 @@ paramsMap.put("token", LCDeviceEngine.newInstance().accessToken); paramsMap.put("deviceId", deviceId); HttpSend.execute(paramsMap, MethodConst.DELETE_DEVICE_PERMISSION,TIME_OUT); + return true; + } + + public static boolean recoverSDCard(String deviceId) throws BusinessException{ + HashMap<String, Object> paramsMap = new HashMap<String, Object>(); + paramsMap.put("token", LCDeviceEngine.newInstance().accessToken); + paramsMap.put("deviceId", deviceId); + HttpSend.execute(paramsMap, MethodConst.RECOVER_SDCARD,TIME_OUT); return true; } @@ -240,7 +244,7 @@ paramsMap.put("channelId", cloudRecordsData.data.channelId); paramsMap.put("beginTime", cloudRecordsData.data.beginTime); paramsMap.put("endTime", cloudRecordsData.data.endTime); - paramsMap.put("nextRecordId", cloudRecordsData.data.nextRecordId); +// paramsMap.put("nextRecordId", cloudRecordsData.data.nextRecordId); paramsMap.put("count", cloudRecordsData.data.count); JsonObject json = HttpSend.execute(paramsMap, MethodConst.METHOD_GET_CLOUND_RECORDS,TIME_OUT); CloudRecordsData.Response response = new CloudRecordsData.Response(); -- Gitblit v1.8.0